Merge branch 'master' into rnn-v2

2019-07-02 18:15:19 -07:00
parent 30375aa4a2 0ff6dba3c8
commit 51aac1e6e7
80 changed files with 1859 additions and 2114 deletions
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -62,7 +62,6 @@ public class MainApplication extends NavigationApplication implements INotificat
  public static MainApplication instance;

  public Boolean sharedExtensionIsOpened = false;
-  public Boolean replyFromPushNotification = false;

  public long APP_START_TIME;

@@ -116,7 +115,6 @@ public class MainApplication extends NavigationApplication implements INotificat
            new ReactNativeDocumentPicker(),
            new SharePackage(this),
            new KeychainPackage(),
-            new InitializationPackage(this),
            new AsyncStoragePackage(),
            new NetInfoPackage(),
            new RNCWebViewPackage(),