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

pull/1/head
ansuz 8 years ago
commit eb78ed072a

@ -3,8 +3,8 @@ env:
matrix: matrix:
- "BROWSER='firefox::Windows 10'" - "BROWSER='firefox::Windows 10'"
- "BROWSER='chrome::Windows 10'" - "BROWSER='chrome::Windows 10'"
- "BROWSER='MicrosoftEdge:14.14393:Windows 10'" #- "BROWSER='MicrosoftEdge:14.14393:Windows 10'"
- "BROWSER='internet explorer:11.103:Windows 10'" #- "BROWSER='internet explorer:11.103:Windows 10'"
#- "BROWSER='safari:10.0:macOS 10.12'" #- "BROWSER='safari:10.0:macOS 10.12'"
#- "BROWSER='safari:9.0:OS X 10.11'" #- "BROWSER='safari:9.0:OS X 10.11'"
branches: branches:

Loading…
Cancel
Save