Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/themes/default/templates/error.tpl.htm

@@ -1,9 +1,8 @@
<div class='alert alert-danger clear'>
  <div class='alert-label'><strong>ERROR</strong></div>
  <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
  <div class='alert-content'>
   <ol>
      <li>###ERRORMSG###</li>
   </ol>
   <div>TODO: WRONG HTML ELEMENTS</div>
  </div>
</div>