diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-20 00:02:18 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-20 00:02:18 -0400 |
| commit | 83683b516ec058d0e5fdd0d4a1defbd22a60c322 (patch) | |
| tree | ec970c671a945a6f64543b62ebdd37647abc89d6 /mod/friendica.php | |
| parent | ccdac0cd99edafdae4348709fcd23f446d1aee18 (diff) | |
| parent | c88dd1485f31a129f6e00bf92afee241708e7da9 (diff) | |
| download | volse-hubzilla-83683b516ec058d0e5fdd0d4a1defbd22a60c322.tar.gz volse-hubzilla-83683b516ec058d0e5fdd0d4a1defbd22a60c322.tar.bz2 volse-hubzilla-83683b516ec058d0e5fdd0d4a1defbd22a60c322.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
* master:
Diffstat (limited to 'mod/friendica.php')
0 files changed, 0 insertions, 0 deletions