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

..

_breadcrumbs.blade.php

…

create.blade.php

Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master

2017-08-29 12:19:00 +05:30

delete.blade.php

Updated styles for auth and books views.

2017-08-26 13:24:55 +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

export.blade.php

…

form.blade.php

Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master

2017-08-29 12:19:00 +05:30

grid-item.blade.php

Resolves book heading issues in grid view.

2017-07-15 16:15:45 +05:30

index.blade.php

Updated styles for auth and books views.

2017-08-26 13:24:55 +01:00

list-item.blade.php

Converted jQuery bits into raw JS components

2017-08-06 21:08:03 +01:00

restrictions.blade.php

Updated chapter views with new design

2017-08-26 14:36:48 +01:00

show.blade.php

Updated styles for auth and books views.

2017-08-26 13:24:55 +01:00

sort-box.blade.php

…

sort.blade.php

Updated styles for auth and books views.

2017-08-26 13:24:55 +01:00