merge develop

Former-commit-id: 4fca2507da
2016-06-30 19:12:07 +03:00
parent b8a0269357 cd564d43ab
commit 97b5014307
67 changed files with 1686 additions and 738 deletions
@@ -22,6 +22,8 @@ import com.github.yamill.orientation.OrientationPackage;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import java.io.File;
+import com.statusim.Jail.JailPackage;

 import com.lwansbrough.RCTCamera.*;
 import com.i18n.reactnativei18n.ReactNativeI18n;
@@ -100,6 +102,7 @@ public class MainActivity extends ReactActivity {
    protected List<ReactPackage> getPackages() {
        return Arrays.<ReactPackage>asList(
                new MainReactPackage(),
+                new JailPackage(),
                new RealmReactPackage(),
                new VectorIconsPackage(),
                new ReactNativeContacts(),