colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bookstack/resources
History
Bharadwaja G 6200948eec Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 
Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php
 		2017-08-29 12:19:00 +05:30
..
assets Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 2017-08-29 12:19:00 +05:30
lang Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 2017-08-29 12:19:00 +05:30
views Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 2017-08-29 12:19:00 +05:30