Abijeet 47d82a1ac2 Merge branch 'master' of https://github.com/BookStackApp/BookStack ... Conflicts: resources/assets/js/vues/vues.js		2017-08-20 20:35:56 +05:30
..
assets	Merge branch 'master' of https://github.com/BookStackApp/BookStack	2017-08-20 20:35:56 +05:30
lang	Update/fix german translation	2017-08-16 22:31:07 +02:00
views	Merge branch 'master' of https://github.com/BookStackApp/BookStack	2017-08-20 20:35:56 +05:30