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

pull/1/head
ansuz 2017-06-01 14:27:17 +02:00
commit eb78ed072a
1 changed files with 2 additions and 2 deletions

View File

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