Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-03-25 14:40:31 -07:00
parent 5c63f7dd58 2115eb26a7
commit e5e0a6b31f
178 changed files with 15561 additions and 11282 deletions
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -3,8 +3,8 @@
 /**
 *   * Name: Redbasic
 *   * Description: Hubzilla standard theme
- *   * Version: 2.0
- *   * MinVersion: 2.2RC
+ *   * Version: 2.1
+ *   * MinVersion: 2.3.1
 *   * MaxVersion: 6.0
 *   * Author: Fabrixxm
 *   * Maintainer: Mike Macgirvin