Merge remote-tracking branch 'origin/navigation-drawer' into navigati…

…on-drawer Conflicts: .travis.yml
rb28z2 · Dec 19, 2014 · d918966 · d918966
2 parents 859b129 + 3bf27a3
commit d918966
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,5 +38,8 @@ deploy:
   api_key:
     secure: XZrg33ILc92Kkz29BmHe2yggfKq4+A7NN3EsNCFl19lB2o8oF4ETGR1QIkHlyYM6MGxr2qqMHAoJdfC17mjJNtp4cpjMmp3FRhH6WUc+epnUuAor9no51B4QUvk7Mr1cWwpcATLWNw+Qg1uen0PNErph1GXgTm0vGpNlrK83+Q8=
   file: app/build/outputs/apk/app-debug.apk
+  skip_cleanup: true
   on:
     repo: write-only-memory/Yaya
+    tags: true
+    all_branches: true