3 Commits (7adc7eef22b2d483fc9423b210378858383aa871)

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