BookStack/resources/views/users
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
..
forms Made fixes to es languge files and users page 2017-03-05 15:34:54 +00:00
create.blade.php Updated remaining views to 2017 design update. 2017-08-26 17:17:04 +01:00
delete.blade.php Updated remaining views to 2017 design update. 2017-08-26 17:17:04 +01:00
edit.blade.php Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 2017-08-29 12:19:00 +05:30
index.blade.php Updated remaining views to 2017 design update. 2017-08-26 17:17:04 +01:00
profile.blade.php Updated remaining views to 2017 design update. 2017-08-26 17:17:04 +01:00