diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-08-13 10:49:41 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-08-13 10:49:41 -0300 |
commit | 0cd31c61fa54ba3de203254810e310e25cf6b215 (patch) | |
tree | 334b14002c947ac5d67d47f01d4302d4b067ff67 /data/images/watermark.png | |
parent | 9c7a740679122b42efbc2f02ea0235c690b1ab8f (diff) | |
parent | 82238ca905804d4a219286f14a86297a2d0d7d27 (diff) |
Merge remote-tracking branch 'ivan/bug/3445_fix-failing-tests' into develop
Diffstat (limited to 'data/images/watermark.png')
0 files changed, 0 insertions, 0 deletions