virvar 5f8f390bd1 Merge remote-tracking branch 'origin/develop' into response-design ...

# Conflicts:
#	src/status_im/db.cljs


Former-commit-id: 86dc0ad06ebcfeb618b529c49b3432b52b106219

2016-06-13 19:54:39 +03:00

..

src/main

Merge remote-tracking branch 'origin/develop' into response-design

2016-06-13 19:54:39 +03:00

BUCK

syng to status

2016-05-19 18:31:56 +02:00

build.gradle

implemented #119 and #120

2016-06-01 11:41:50 +03:00

proguard-rules.pro

Initial

2016-02-23 01:04:42 +03:00

react.gradle

moved re-frame app to root folder

2016-04-04 19:21:10 +03:00