Merge branch 'master' into no-xmpp
authorJoey Hess <joeyh@joeyh.name>
Sat, 24 Dec 2016 18:48:51 +0000 (14:48 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 24 Dec 2016 19:01:55 +0000 (15:01 -0400)
commitab66bbfeb66e1a40eb40d06931fe0bc7a0224449
treec7e4c53467924db3f2662803c6209a0db9a479de
parentd58148031bae065729b1d470ca1f67bfb368b364
parent8484c0c1976b2daa4be674b09f6f54c15c746aa6
Merge branch 'master' into no-xmpp
Assistant/Sync.hs
Assistant/Threads/Merger.hs
Assistant/Threads/WebApp.hs
Assistant/WebApp/Notifications.hs
Assistant/WebApp/Types.hs
CmdLine/GitAnnex.hs
Makefile
debian/control
doc/git-annex.mdwn
doc/todo/xmpp_removal.mdwn
git-annex.cabal