Merge branch 'develop' into feature/2fa

circle.yml

@@ -34,7 +34,7 @@ dependencies:
 test:
   override:
     - ./gradlew assembleRelease --stacktrace
-    - find . -name app-*-release.apk -exec mv {} $CIRCLE_ARTIFACTS/ \;
+    - find . -name *.apk -exec mv {} $CIRCLE_ARTIFACTS/ \;
 
 deployment:
   beta:
@@ -48,4 +48,4 @@ deployment:
     owner: RocketChat
     commands:
       - ./gradlew publishListingRelease
-        -Dorg.gradle.pr oject.track=alpha
\ No newline at end of file
+        -Dorg.gradle.pr oject.track=alpha