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

Merge branch 'master' into develop

This commit is contained in:
mike-thompson-day8 2015-05-08 15:46:59 +10:00
parent c2016e91d4 1b2671fcd4
commit 802d5142f8
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -104,7 +104,7 @@ __Warning__: That was the summary. What follows is a long-ish tutorial/explanat
- [Talking To A Server](#talking-to-a-server) - [Talking To A Server](#talking-to-a-server)
- [The CPU Hog Problem](#the-cpu-hog-problem) - [The CPU Hog Problem](#the-cpu-hog-problem)
- [In Summary](#in-summary) - [In Summary](#in-summary)
- [Where Do I Go Next](#Where-Do-I-Go-Next) - [Where Do I Go Next](#where-do-i-go-next)
- [Licence](#licence) - [Licence](#licence)
## What Problem Does It Solve? ## What Problem Does It Solve?
@ -1211,6 +1211,3 @@ Distributed under The MIT License (MIT) - See LICENSE.txt
[datascript]:https://github.com/tonsky/datascript [datascript]:https://github.com/tonsky/datascript
[Hoplon]:http://hoplon.io/ [Hoplon]:http://hoplon.io/
[Pedestal App]:https://github.com/pedestal/pedestal-app [Pedestal App]:https://github.com/pedestal/pedestal-app