diff options
| author | friendica <info@friendica.com> | 2014-12-01 18:53:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-01 18:53:49 -0800 |
| commit | f3b92c0ef228a25c6d6734d60a23251506317b3f (patch) | |
| tree | f20fa34ea54008af6b6ea39cf9e6800ee3aec3e8 /app/settings.apd | |
| parent | 0b84ba1eab8a583f7cf89f44f37b78e9cac72e1b (diff) | |
| parent | 460d379e7efc074808109b4c9acd0aea46460d16 (diff) | |
| download | volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.tar.gz volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.tar.bz2 volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.zip | |
Merge https://github.com/friendica/red into pending_merge
Conflicts:
version.inc
Diffstat (limited to 'app/settings.apd')
0 files changed, 0 insertions, 0 deletions