mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-16 10:04:34 +02:00
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source 
Conflicts:
	engine/Monstra.php
	public/assets/js/bootstrap.js
This commit is contained in:
Awilum
2014-01-01 21:32:20 +02:00
parent 83f80306d3 cd0d8296a5
commit 5ea80e31e0
20 changed files with 5290 additions and 3342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/box/users/languages/de.lang.php
View File

@@ -63,6 +63,6 @@
'Your login details for :site_name' => 'Deine Login-Daten für :site_name',
'About Me' => 'Über Mich',
'Profile' => 'Profil',
'You are banned for 10 minutes. Try again later' => 'You are banned for 10 minutes. Try again later',
'You are banned for 10 minutes. Try again later' => 'Du wurdest für 10 Minuten blockiert. Bitte probier es später nochmal',
)
);

4
plugins/box/users/views/emails/layout_email.view.php
View File

@@ -192,7 +192,9 @@
<table width="100%" cellpadding="10" cellspacing="0" border="0">
<tr>
<td valign="top" style="font-size:11px; border-top:1px dashed #ccc; text-align:right;">
<p style="margin-top:0; margin-bottom:0;">© 2012 - 2014 <a href="http://monstra.org" style="color:#333; text-decoration:none;">MONSTRA.ORG</p>
<p style="margin-top:0; margin-bottom:0;">
</p>
</td>
</tr>
</table>