Merge branch 'develop' for 2.1

10up · Oct 23, 2018 · 9de2a4c · 9de2a4c
2 parents 172f563 + 01721ab
commit 9de2a4c
Show file tree

Hide file tree

Showing 22 changed files with 172 additions and 581 deletions.
diff --git a/composer.json b/composer.json
@@ -0,0 +1,25 @@
+{
+  "name": "10up/simple-local-avatars",
+  "description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!",
+  "version": "2.1",
+  "type": "wordpress-plugin",
+  "keywords": [
+    "wordpress",
+    "10up"
+  ],
+  "homepage": "https://github.com/10up/simple-local-avatars",
+  "license": ["GPL-2.0-only"],
+  "authors": [
+    {
+      "name": "10up",
+      "homepage": "https://10up.com/"
+    }
+  ],
+  "support": {
+    "issues": "https://github.com/10up/simple-local-avatars/issues",
+    "source": "https://github.com/10up/simple-local-avatars"
+  },
+  "require": {
+    "php": ">=5.3"
+  }
+}
diff --git a/localization/simple-local-avatars-be_BY.mo b/localization/simple-local-avatars-be_BY.mo
diff --git a/localization/simple-local-avatars-be_BY.po b/localization/simple-local-avatars-be_BY.po
diff --git a/localization/simple-local-avatars-de_DE.mo b/localization/simple-local-avatars-de_DE.mo
diff --git a/localization/simple-local-avatars-de_DE.po b/localization/simple-local-avatars-de_DE.po
diff --git a/localization/simple-local-avatars-es_ES.mo b/localization/simple-local-avatars-es_ES.mo
diff --git a/localization/simple-local-avatars-es_ES.po b/localization/simple-local-avatars-es_ES.po
diff --git a/localization/simple-local-avatars-fr_FR.mo b/localization/simple-local-avatars-fr_FR.mo
diff --git a/localization/simple-local-avatars-fr_FR.po b/localization/simple-local-avatars-fr_FR.po
diff --git a/localization/simple-local-avatars-hu_HU.mo b/localization/simple-local-avatars-hu_HU.mo
diff --git a/localization/simple-local-avatars-hu_HU.po b/localization/simple-local-avatars-hu_HU.po
diff --git a/localization/simple-local-avatars-it_IT.mo b/localization/simple-local-avatars-it_IT.mo