Merge branch 'master' into 'master'

Update license to GPLv3+ and fix some typos



See merge request !1199
This commit is contained in:
Daniel Martí 2016-02-09 17:57:39 +00:00
commit 0f4c962b4c

View file

@ -1,5 +1,5 @@
Categories:Writing,Internet Categories:Writing,Internet
License:GPLv2+ License:GPLv3+
Web Site:http://www.niedermann.it Web Site:http://www.niedermann.it
Source Code:https://github.com/stefan-niedermann/OwnCloud-Notes Source Code:https://github.com/stefan-niedermann/OwnCloud-Notes
Issue Tracker:https://github.com/stefan-niedermann/OwnCloud-Notes/issues Issue Tracker:https://github.com/stefan-niedermann/OwnCloud-Notes/issues
@ -13,11 +13,11 @@ Companion app to ownCloud Notes.
Features Features
* List, Create, Edit, Share and Delete Notes * List, create, edit, search, share and delete notes
* Share Text and Links as new Note into the App * Share text and links as new note into the app
* Bulk Delete * Bulk delete
* Render MarkDown (using Bypass) * Render MarkDown (using Bypass)
* English, German, Russian, Armenian and Serbian UI * English, German, Russian, Armenian, French and Serbian UI
Requirements Requirements