Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 1 | -0/+33 |
Conflicts: view/php/theme_init.php |
index : volse-hubzilla.git | ||
Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
aboutsummaryrefslogtreecommitdiffstats |
Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 1 | -0/+33 |
Conflicts: view/php/theme_init.php |