Merge branch 'master' into gh-pages

* master: Fixed stars Fixed CN flag Fixed Saint Martin flags (Fixes lipis#32) Updated composer.json added composer.json
eunarede · Oct 28, 2014 · de81494 · de81494
2 parents cce76fa + 89f11fe
commit de81494
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 441 deletions.
diff --git a/composer.json b/composer.json
@@ -0,0 +1,22 @@
+{
+  "name": "components/flag-icon-css",
+  "type": "component",
+  "description": "CSS for vector based country flags",
+  "license": "MIT",
+  "authors":[
+    {
+      "name": "Panayiotis Lipiridis (Lipis)",
+      "email": "[email protected]"
+    }
+  ],
+  "extra":{
+    "component":{
+      "name": "flag-icon-css",
+      "files":[
+        "less/**",
+        "css/**",
+        "flags/**"
+      ]
+    }
+  }
+}
diff --git a/flags/1x1/cn.svg b/flags/1x1/cn.svg