web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:xwiki-labs/cryptpad

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
ansuz
2016-03-04 11:28:27 +01:00
parent 5e1566eaec c87bb2ec2d
commit 0327fbc874
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -1,4 +1,8 @@
language: node_js
node_js:
- "0.12"
script: npm run-script lint
branches:
only:
- master
- diffdom
node_js:
- "0.12"