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

..

de

Resolved conflicts

2017-08-24 12:21:43 +05:30

en

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

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

es

Resolved conflicts

2017-08-24 12:21:43 +05:30

fr

Resolved conflicts

2017-08-24 12:21:43 +05:30

ja

Translate errors.php

2017-07-01 16:38:43 +09:00

nl

Resolved conflicts

2017-08-24 12:21:43 +05:30

pl

Polish translation

2017-07-13 16:00:42 +02:00

pt_BR

Resolved conflicts

2017-08-24 12:21:43 +05:30

sk

Resolved conflicts

2017-08-24 12:21:43 +05:30