status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into fix-input 

Former-commit-id: 7745f1accb
This commit is contained in:
virvar 2016-05-25 12:45:34 +03:00
parent a6b9ec3b9e ded52dca90
commit 1314cff149
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.clj
View File

@ -10,7 +10,7 @@
[prismatic/schema "1.0.4"] [prismatic/schema "1.0.4"]
^{:voom {:repo "https://github.com/status-im/status-lib.git" ^{:voom {:repo "https://github.com/status-im/status-lib.git"
:branch "master"}} :branch "master"}}
[status-im/protocol "0.1.1-20160524_084524-gae39f36"] [status-im/protocol "0.1.1-20160525_083359-g53ab2c2"]
[natal-shell "0.1.6"] [natal-shell "0.1.6"]
[com.andrewmcveigh/cljs-time "0.4.0"]] [com.andrewmcveigh/cljs-time "0.4.0"]]
:plugins [[lein-cljsbuild "1.1.1"] :plugins [[lein-cljsbuild "1.1.1"]