diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
| commit | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch) | |
| tree | 5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /view/album_edit.tpl | |
| parent | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff) | |
| parent | 5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff) | |
| download | volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2 volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
Diffstat (limited to 'view/album_edit.tpl')
0 files changed, 0 insertions, 0 deletions