diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
| commit | c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (patch) | |
| tree | 96e8dc34468a325596a5f94c85e38374fbc4b9ba /lib/images | |
| parent | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (diff) | |
| parent | 38d74b12176722ce52dc1905c13816a78a2551ee (diff) | |
| download | rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.gz rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Conflicts:
inc/parser/xhtml.php
Diffstat (limited to 'lib/images')
| -rw-r--r-- | lib/images/interwiki/meatball.gif | bin | 339 -> 0 bytes |
| -rw-r--r-- | lib/images/interwiki/wiki.gif | bin | 131 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/lib/images/interwiki/meatball.gif b/lib/images/interwiki/meatball.gif Binary files differdeleted file mode 100644 index 8a4cbdbfc..000000000 --- a/lib/images/interwiki/meatball.gif +++ /dev/null diff --git a/lib/images/interwiki/wiki.gif b/lib/images/interwiki/wiki.gif Binary files differdeleted file mode 100644 index df241d6bb..000000000 --- a/lib/images/interwiki/wiki.gif +++ /dev/null |
