diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-30 18:19:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-30 18:19:17 -0400 |
| commit | e3c60b8f4cfbad202a28ec4f1452f74c68397361 (patch) | |
| tree | f34c3ed83538770dcb94aa7a4a2034506605f324 /Assistant | |
| parent | 502bc5d5f84a26bfd2ca700d8f90d78a81c7b1ac (diff) | |
| parent | 999d337f9cbbb2bc16a25532c66b525d7064b95d (diff) | |
Merge branch 'master' into assistant-longpolling-rewrite
Diffstat (limited to 'Assistant')
0 files changed, 0 insertions, 0 deletions