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
..
icons	Added facebook, slack & twitter sign in options.	2017-02-04 11:01:49 +00:00
js	Merge branch 'master' of https://github.com/BookStackApp/BookStack	2017-08-20 20:35:56 +05:30
sass	Updated header design	2017-08-19 15:33:22 +01:00