Commit 0c013c471b78d160e8943ab9ca3eefb38482fde2
Exists in
master
and in
8 other branches
Merge branch 'rafael' into merlin
Showing
2 changed files
with
2 additions
and
1 deletions
Show diff stats
.gitignore
| @@ -5,6 +5,7 @@ bower_components/ | @@ -5,6 +5,7 @@ bower_components/ | ||
| 5 | .tmp/ | 5 | .tmp/ |
| 6 | dist/ | 6 | dist/ |
| 7 | .editorconfig | 7 | .editorconfig |
| 8 | +script-staging.sh | ||
| 8 | 9 | ||
| 9 | # ignore generated sprite | 10 | # ignore generated sprite |
| 10 | -src/assets/images/icons/sprite.png | ||
| 11 | \ No newline at end of file | 11 | \ No newline at end of file |
| 12 | +src/assets/images/icons/sprite.png |