aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-19 12:32:09 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-19 12:32:09 -0400
commitcaa6bc96f38e8877a4c12dc90daa9f38f332adde (patch)
treef6e22c5352cddc95033076aa3507ff1caf231437 /README
parent5916bc6539adee64fb5f1bf303b902d8e1efa3f9 (diff)
parent44f4b4b9d1bd28a8c77e9f851e85fdb22c8fd8b1 (diff)
downloadvolse-hubzilla-caa6bc96f38e8877a4c12dc90daa9f38f332adde.tar.gz
volse-hubzilla-caa6bc96f38e8877a4c12dc90daa9f38f332adde.tar.bz2
volse-hubzilla-caa6bc96f38e8877a4c12dc90daa9f38f332adde.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: Hadn't merged fixed typo from upstream. EO translation fixes filebrowser: fix style, show 10 recent photos if not in an album filebrowser: more style, load min and max scale photos tinymce: add inlinepopups plugin tinymce: add filebrowser for photos and attached files * master:
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions