status-im/re-frame
2
0
Fork 0
mirror of https://github.com/status-im/re-frame.git synced 2025-02-23 07:18:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	docs/External-Resources.md
	docs/Interceptors.md
This commit is contained in:
Mike Thompson 2016-12-04 22:52:07 +11:00
commit 54f39c8ce5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/External-Resources.md
View File

@ -36,7 +36,7 @@ Templates, examples, and other resources related to re-frame. For additions or m
* [Crossed](https://github.com/velveteer/crossed/) by [Velveteer] - A multiplayer crossword puzzle generator. Based on re-frame `0.7.0` * [Crossed](https://github.com/velveteer/crossed/) by [Velveteer] - A multiplayer crossword puzzle generator. Based on re-frame `0.7.0`
* [imperimetric](https://github.com/Dexterminator/imperimetric) by [Dexter Gramfors] - Webapp for converting texts with some system of measurement to another, such as imperial to metric. Based on re-frame `0.7.0` * [imperimetric](https://github.com/Dexterminator/imperimetric) by [Dexter Gramfors] - Webapp for converting texts with some system of measurement to another, such as imperial to metric. Based on re-frame `0.8.0`
* [Brave Clojure Open Source](https://github.com/braveclojure/open-source) by [Daniel Higginbotham]. A site using re-frame, liberator, boot and more to display active github projects that powers [http://open-source.braveclojure.com](http://open-source.braveclojure.com). Based on re-frame `0.6.0` * [Brave Clojure Open Source](https://github.com/braveclojure/open-source) by [Daniel Higginbotham]. A site using re-frame, liberator, boot and more to display active github projects that powers [http://open-source.braveclojure.com](http://open-source.braveclojure.com). Based on re-frame `0.6.0`
@ -78,3 +78,6 @@ Templates, examples, and other resources related to re-frame. For additions or m
[Toni Reina]: https://github.com/areina [Toni Reina]: https://github.com/areina
[Velveteer]: https://github.com/velveteer [Velveteer]: https://github.com/velveteer
[Yogthos]:http://yogthos.net/index.html [Yogthos]:http://yogthos.net/index.html