From 9250887c8d36372534fcca599f5beec2c6c6dfba Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Sat, 23 Jul 2016 10:59:04 +1000 Subject: [PATCH] Fix merge --- src/apps.json | 11 +++++++++++ src/icons/ArvanCloud.png | Bin 0 -> 23686 bytes 2 files changed, 11 insertions(+) create mode 100644 src/icons/ArvanCloud.png diff --git a/src/apps.json b/src/apps.json index 5ca8a5977..cfe02c7dc 100755 --- a/src/apps.json +++ b/src/apps.json @@ -9091,6 +9091,17 @@ "PHP" ], "website": "pimcore.org" + }, + "ArvanCloud": { + "cats": [ + 31 + ], + "env": "^ArvanCloud$", + "headers": { + "AR-PoweredBy": "Arvan Cloud (arvancloud.com)" + }, + "icon": "ArvanCloud.png", + "website": "www.ArvanCloud.com" } }, "categories": { diff --git a/src/icons/ArvanCloud.png b/src/icons/ArvanCloud.png new file mode 100644 index 0000000000000000000000000000000000000000..b8eb19159e234f6494ab83a738f7dc819fdbcfc4 GIT binary patch literal 23686 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 literal 0 HcmV?d00001