diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-03 17:34:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-03 17:46:22 -0400 |
| commit | bc94dde8f6c5d7ca213fa81a6c03a4c9e22e16d5 (patch) | |
| tree | 9a5384d53b222577004ce2cbe8b1540a5e3f2e90 /git-union-merge.hs | |
| parent | efa88a0f1589a82a91a06ed3a3cbd5f4106aabb4 (diff) | |
XMPP pair requests are now received, and an alert displayed
Diffstat (limited to 'git-union-merge.hs')
0 files changed, 0 insertions, 0 deletions