diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 22:12:31 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 22:12:31 +0200 |
| commit | e29ae46609f42a03ade20c7f935e2cded84db51f (patch) | |
| tree | b896f79353e792c5d34d7dc8dc9220c49bbfd6df /settings/trans.png | |
| parent | cf492a96496920c42f3ad384f5ca0886a5323c72 (diff) | |
| parent | 6bfe2289be05e9f54272a86a0f957ec41ef32e28 (diff) | |
| download | nextcloud-server-e29ae46609f42a03ade20c7f935e2cded84db51f.tar.gz nextcloud-server-e29ae46609f42a03ade20c7f935e2cded84db51f.zip | |
fix merge conflicts
Diffstat (limited to 'settings/trans.png')
| -rw-r--r-- | settings/trans.png | bin | 0 -> 187 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/settings/trans.png b/settings/trans.png Binary files differnew file mode 100644 index 00000000000..e6920168bf2 --- /dev/null +++ b/settings/trans.png |