3 Commits (c5762411043e38ff361513ac1b1e0021e84ac1ce)

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