Merge branch 'master' into 'master'

Add Vector v0.4.0 release

Right, should be fine now!

See merge request !1618

metadata/im.vector.alpha.txt

@@ -19,7 +19,7 @@ the center of all your discussions!
 Features include:
 
 * Instantly share messages, images, videos and files of any kind within groups of any size
-* Voice and video calling via WebRTC
+* Voice and video 1-1 and conference calling via WebRTC
 * See who's reading your messages with read receipts
 * Communicate with users anywhere in the Matrix.org ecosystem - not just Vector users!
 * Discover and invite users by email address
@@ -49,7 +49,6 @@ Coming soon:
 * Add your own integrations, bridges and bots!
 * Email notifications of missed messages and invites
 * End-to-end encryption using Olm ([https://matrix.org/git/olm])
-* Voice and video conferencing (already available on the web version at [https://vector.im])
 * Screen sharing
 * Login as multiple users at the same time
 
@@ -77,7 +76,16 @@ Build:0.3.4,304
         sed -i -e '/projectDir/d' ../settings.gradle && \
         sed -i -e '/play-services/d' build.gradle
 
+Build:0.4.0,400
+    commit=c7724d8c148e454c338ed33c81b85d55b0985c87
+    subdir=vector
+    gradle=appfdroid
+    srclibs=matrixsdk@2ed84ed78fa2854ad00041e591ea0f040c9d4b7b
+    prebuild=cp -fR $$matrixsdk$$/matrix-sdk ../ && \
+        sed -i -e '/projectDir/d' ../settings.gradle && \
+        sed -i -e '/play-services/d' build.gradle
+
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:0.3.4
-Current Version Code:304
+Current Version:0.4.0
+Current Version Code:400