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

diff --cc app/Http/Controllers/BookController.php
Simple merge

diff --cc resources/assets/js/global.js
Simple merge

diff --cc resources/assets/sass/styles.scss
Simple merge

diff --cc resources/lang/en/common.php
Simple merge

diff --cc resources/lang/en/settings.php
index 468c5981f9641178e8d0dc8f1c1d23904761d690,644ca3a31497491fd20e4906a96ceaddb6221fda..4153055eb39443d3f427426d95ebd3b5dde86f63
mode 100755,100644..100755
--- 1/resources/lang/en/settings.php
--- 2/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php

diff --cc resources/lang/nl/common.php
Simple merge

diff --cc resources/lang/pt_BR/common.php
index 632a1a078bc99bbdd2affbcb99517e0b73df4b36,97b6a93c4f273036d0bc836084dfe39c0292eabd..991cb0b7e4fbfde96fe75a270cd2176125f5a8c6
--- 1/resources/lang/pt_BR/common.php
--- 2/resources/lang/pt_BR/common.php
+++ b/resources/lang/pt_BR/common.php
@@@ -45,7 -44,7 +46,8 @@@ return 
      'no_items' => 'Nenhum item disponível',
      'back_to_top' => 'Voltar ao topo',
      'toggle_details' => 'Alternar Detalhes',
+     'toggle_thumbnails' => 'Alternar Miniaturas',
 +    'details' => 'Detalhes',
  
      /**
       * Header

diff --cc resources/lang/pt_BR/settings.php
Simple merge

diff --cc tests/UserProfileTest.php
Simple merge