Abijeet b3d4c199ae Merge branch 'master' of https://github.com/Abijeet/BookStack ... Conflicts: .gitignore		2017-04-19 01:21:45 +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/Abijeet/BookStack	2017-04-19 01:21:45 +05:30
sass	Merge branch 'master' of https://github.com/Abijeet/BookStack	2017-04-19 01:21:45 +05:30