diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 18:59:53 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 18:59:53 -0400 |
| commit | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (patch) | |
| tree | 4ca5c8b9f42079a557cebb93d4074695e89b19bd /include/directory.php | |
| parent | 2589feef70cdc7d98f61a25035be82713ff93725 (diff) | |
| download | volse-hubzilla-9472ba8d2031183cc9d573f27e02511c1c5a3050.tar.gz volse-hubzilla-9472ba8d2031183cc9d573f27e02511c1c5a3050.tar.bz2 volse-hubzilla-9472ba8d2031183cc9d573f27e02511c1c5a3050.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
slight improvement in handling of plaintext feeds
css-fixes
add new messages-layout in diabook
fix the display of community-plugin in diabook-themes
that didn't quite work out
document tinymce fixes/workarounds
various bugfixes and css-fixes
qcomment overflow
try slightly better detection of html in feeds
send unverified private mail using zrl
* master:
Diffstat (limited to 'include/directory.php')
0 files changed, 0 insertions, 0 deletions