From: Dan Brown <redacted>
Date: Wed, 6 Dec 2017 15:52:54 +0000 (+0000)
Subject: Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack... 
X-Git-Tag: v0.19.0~1^2~15
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/bc1302a8d8c9c7facb16b28e1cf1da4409e7ede0?ds=inline;hp=--cc

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

bc1302a8d8c9c7facb16b28e1cf1da4409e7ede0
diff --cc resources/lang/en/settings.php
index 468c5981f,644ca3a31..4153055eb
mode 100755,100644..100755
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
diff --cc resources/lang/pt_BR/common.php
index 632a1a078,97b6a93c4..991cb0b7e
--- a/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