diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-25 00:59:25 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-25 00:59:25 -0400 |
| commit | 5bd4f62210c9672dd7d502cf8a74ee34727536fc (patch) | |
| tree | 1c5d43999b433007ff19bd5c591a1c9b3b027e82 /view/theme/loozah/contact_template.tpl | |
| parent | 8a6c407282fe10f676f08f21e28647a5c8794e11 (diff) | |
| parent | f1cb28774230cb69b9ce8ee5b32e4e2531aa586a (diff) | |
| download | volse-hubzilla-5bd4f62210c9672dd7d502cf8a74ee34727536fc.tar.gz volse-hubzilla-5bd4f62210c9672dd7d502cf8a74ee34727536fc.tar.bz2 volse-hubzilla-5bd4f62210c9672dd7d502cf8a74ee34727536fc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #329 - compress the plugin list on the friendica info page
bug #346 - add oembed maxwidth to oembed request
* master:
Diffstat (limited to 'view/theme/loozah/contact_template.tpl')
0 files changed, 0 insertions, 0 deletions