7 Commits

Include renames

Author	SHA1	Message	Date
Caleb James DeLisle	f3fb674504	Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax	2016-03-25 16:50:17 +01:00
Caleb James DeLisle	98c85cef8b	xxx	2016-03-25 16:49:27 +01:00
ansuz	12dcbc9121	fix quick red fox and make test.cancel work again	2016-03-25 16:14:17 +01:00
Caleb James DeLisle	669bcc1935	If there is a difference in the hjson then send a message back	2016-03-25 14:26:31 +01:00
Caleb James DeLisle	f62ec85a4c	Shuffled around some assertions and logs	2016-03-25 14:14:19 +01:00
Caleb James DeLisle	420a7098a6	more testing and crap	2016-03-25 12:45:51 +01:00
ansuz	4b35a145e3	Push WIP	2016-03-25 11:04:27 +01:00