Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:stevenrskelton/flag-icon
Browse files Browse the repository at this point in the history
Conflicts:
	bower.json
  • Loading branch information
stevenrskelton committed Nov 13, 2014
2 parents ff31861 + 4cd307f commit 1a3ea79
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@
"icon",
"svg",
"flag",
"maritime"
"maritime",
"nascar",
"indycar",
"racing",
"canada",
"united states",
"germany",
"australia",
"spain"
],
"dependencies": {
"polymer": "Polymer/polymer#>=0.5.1"
Expand Down

0 comments on commit 1a3ea79

Please sign in to comment.