Merge branch 'master' into development

cMikolai · Jul 27, 2020 · 48cbe7d · 48cbe7d
2 parents ddbf86a + c854031
commit 48cbe7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -115,5 +115,3 @@ build
 
 
 package-lock.json
-/config/database.js
-plugins.js
diff --git a/config/plugins.js b/config/plugins.js
@@ -0,0 +1,10 @@
+module.exports = ({ env }) => ({
+  upload: {
+    provider: 'cloudinary',
+    providerOptions: {
+      cloud_name: env('CLOUDINARY_NAME'),
+      api_key: env('CLOUDINARY_KEY'),
+      api_secret: env('CLOUDINARY_SECRET'),
+    },
+  },
+});
Original file line number	Diff line number	Diff line change
Expand Up		@@ -115,5 +115,3 @@ build


		package-lock.json
		/config/database.js
		plugins.js