Merge branch 'master' of github.com:mnscholz/blendedmalts

Conflicts: template.php
WissKI · Mar 22, 2013 · 642bad0 · 642bad0
2 parents 31993e5 + c6616d7
commit 642bad0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/template.php b/template.php
@@ -155,3 +155,4 @@ function blendedmalts_button($element) {
 }
 
 ?>
+