Merge branch 'master' into dev
Conflicts: VERSION
This commit is contained in:
commit
523a33b83e
6
VERSION
6
VERSION
@ -2,6 +2,7 @@ v0.2.6
|
|||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
* Settings Updates
|
* Settings Updates
|
||||||
* Choose to hide items on filter
|
* Choose to hide items on filter
|
||||||
* Choose boards when creating/editing a user
|
* Choose boards when creating/editing a user
|
||||||
@ -9,3 +10,8 @@ Changelog
|
|||||||
* Dates show up on comments and attachments without reload
|
* Dates show up on comments and attachments without reload
|
||||||
* Opening login page redirects to boards if a valid token is found
|
* Opening login page redirects to boards if a valid token is found
|
||||||
|
|
||||||
|
=======
|
||||||
|
* Markdown support in comments
|
||||||
|
* Cursor on default input field
|
||||||
|
* Show app version
|
||||||
|
>>>>>>> master
|
||||||
|
Reference in New Issue
Block a user