diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-07 14:47:02 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-07 14:47:02 -0400 |
| commit | cee36087470acbc4aeff121ab91cd337737dcc67 (patch) | |
| tree | a093294b2b3ee2f99c0dc5b95d5844bf9817eafa /view/diaspora_retract.tpl | |
| parent | bc69a957dc875b699240827cb4af2691f8a8fcd6 (diff) | |
| parent | f931d5c918fa3146afa851a4f32c90a35ee1c85b (diff) | |
| download | volse-hubzilla-cee36087470acbc4aeff121ab91cd337737dcc67.tar.gz volse-hubzilla-cee36087470acbc4aeff121ab91cd337737dcc67.tar.bz2 volse-hubzilla-cee36087470acbc4aeff121ab91cd337737dcc67.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: small fix
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
ignore utf8 offset error for unit tests
had arg order backwards
try assertContains
tag tests cont.
fix autonamenegativelength test
some work on tests
* master:
Diffstat (limited to 'view/diaspora_retract.tpl')
0 files changed, 0 insertions, 0 deletions