diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-13 21:59:16 +0200 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-13 21:59:16 +0200 |
| commit | a01d10e57db1893939d0a7706fad239df537e24b (patch) | |
| tree | 3649dab6d0006981225f88574b26447f9fbeac1f /core | |
| parent | 4cbae823eb742fac80288c6c74acba26e0a9c5d6 (diff) | |
| parent | db2fb38746bb9d89b402c3a768a247945d813989 (diff) | |
| download | nextcloud-server-a01d10e57db1893939d0a7706fad239df537e24b.tar.gz nextcloud-server-a01d10e57db1893939d0a7706fad239df537e24b.zip | |
Merge branch 'master' into calendar
Diffstat (limited to 'core')
| -rw-r--r-- | core/img/filetypes/code-script.png (renamed from core/img/filetypes/script.png) | bin | 859 -> 859 bytes |
| -rw-r--r-- | core/img/filetypes/text-x-php.png (renamed from core/img/filetypes/php.png) | bin | 538 -> 538 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/core/img/filetypes/script.png b/core/img/filetypes/code-script.png Binary files differindex 63fe6ceff5b..63fe6ceff5b 100644 --- a/core/img/filetypes/script.png +++ b/core/img/filetypes/code-script.png diff --git a/core/img/filetypes/php.png b/core/img/filetypes/text-x-php.png Binary files differindex 7868a25945c..7868a25945c 100644 --- a/core/img/filetypes/php.png +++ b/core/img/filetypes/text-x-php.png |
