Merge https://github.com/annando/friendica into annando

Conflicts: view/admin_site.tpl
2012-12-22 23:02:21 -08:00
parent 453082516e b0759e9a9f
commit a29842e301
14 changed files with 236 additions and 285 deletions
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -1,10 +1,11 @@
 <?php
 /**
 * Name: Vier
- * Version: 0.1
+ * Version: 0.9
 * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
 * Author: Ike <http://pirati.ca/profile/heluecht>
 * Maintainer: Ike <http://pirati.ca/profile/heluecht>
+ * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
 */

 $a->theme['template_engine'] = 'smarty3';