Browse Source

update conficts for PR

revert-371-master
Frank Bian 10 years ago
parent
commit
018efc71cf
  1. 3
      README.md

3
README.md

@ -76,7 +76,8 @@ Table of Contents
* https://talky.io/ - Free group video chat. Anonymous. Peer‑to‑peer. No plugins, signup, or payment required.
* http://sourcetalk.net/ - Code discussion tool, free for open code talks.
* http://vipaar.com/ - Help over video with augmented reality. Free without analytics, encryption, support.
* https://evernote.com/ - Tool for organizing information. Share your notes and work together with others.
* https://evernote.com/ - Tool for organizing information. Share your notes and work together with others.
* https://www.wunderlist.com/ - Share your lists and work collaboratively on projects with your colleagues - Available for free to download and use on iPhone,iPad,Mac,Android,Windows and the Web.
## Code Quality

Loading…
Cancel
Save