From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/conf/error/br/400.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/conf/error/br/400.html b/server/conf/error/br/400.html
index 212b1a9..e89e706 100644
--- a/server/conf/error/br/400.html
+++ b/server/conf/error/br/400.html
@@ -52,7 +52,7 @@
   </div>
   <div id="content">
     <h2>O seguinte erro ocorreu:</h2>
-    <p>VocĂȘ usou uma sintaxe inv&aacute;lida.</p>
+    <p>Voc&ecirc; usou uma sintaxe inv&aacute;lida.</p>
     <P>Se tiver qualquer d&uacute;vida extra sobre este erro contate seu webmaster.</p>
   </div>
   <div id="footer">

--
Gitblit v1.9.1