3 Commits (ec64e0d3816a9999b7f6d330e1f114b9411b40f0)

Author	SHA1	Message	Date
ansuz	0327fbc874	Merge branch 'master' of github.com:xwiki-labs/cryptpad ... Conflicts: .travis.yml	2016-03-04 11:28:27 +01:00
Caleb James DeLisle	babef5d6ac	mv travis.yml ./.travis.yml	2016-02-12 10:46:52 +01:00
Caleb James DeLisle	591323a62e	travis.yml	2016-02-12 10:46:10 +01:00