0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00

Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander 2016-07-06 12:20:34 +03:00
commit 65031503cd

View File

@ -10,7 +10,7 @@ env:
- QT_BASE=56 - QT_BASE=56
before_install: before_install:
- if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt56-trusty -y; fi - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt561-trusty -y; fi
- sudo apt-get update -qq - sudo apt-get update -qq
install: install: