Merge branch 'development' of https://github.com/siacs/Conversations into development

2015-01-04 17:23:51 +01:00 · 2015-01-04 17:23:51 +01:00 · d7ac9b88cf
parent 0c804af1bc 4f34a8f73f
commit d7ac9b88cf
1 changed files with 7 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,7 @@
 language: android
 android:
  components:
    - platform-tools
    - tools
    - build-tools-19.1.0
    - android-19