3 Commits (a1fe941f6990fe733a8ed0ca76c875c6bdb1e5d8)

Author	SHA1	Message	Date
ansuz	0327fbc874	Merge branch 'master' of github.com:xwiki-labs/cryptpad ... Conflicts: .travis.yml	9 years ago
Caleb James DeLisle	babef5d6ac	mv travis.yml ./.travis.yml	9 years ago
Caleb James DeLisle	591323a62e	travis.yml	9 years ago