diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-17 13:17:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-17 13:17:13 -0400 |
| commit | d92bab669331098b1ad7cd435c2fa6582ddab5f0 (patch) | |
| tree | 3b78cca8cb5a7e36a2ca597dede1d83ac79ac1f2 /view/diaspora_comment.tpl | |
| parent | 04af5d9e2cc7a05c6ea0312643ddc4e8b45846bf (diff) | |
| download | volse-hubzilla-d92bab669331098b1ad7cd435c2fa6582ddab5f0.tar.gz volse-hubzilla-d92bab669331098b1ad7cd435c2fa6582ddab5f0.tar.bz2 volse-hubzilla-d92bab669331098b1ad7cd435c2fa6582ddab5f0.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
update to the German string files
diabook-themes: removed fpostit due to security issues and small fix in german translation
naked br appearing when attaching and textplain
Some Bugfixes, and variable checks
rev update
* master:
Diffstat (limited to 'view/diaspora_comment.tpl')
0 files changed, 0 insertions, 0 deletions