Merge branch 'rafael' into merlin

Leonardo Merlin
2 parents 3f20fe18 402a482a
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
.gitignore
script-staging.sh
@@ -5,6 +5,7 @@ bower_components/
 .tmp/
 dist/
 .editorconfig
+script-staging.sh
  
 # ignore generated sprite
-src/assets/images/icons/sprite.png
 \ No newline at end of file
+src/assets/images/icons/sprite.png
...	...	@@ -5,6 +5,7 @@ bower_components/
5	5	.tmp/
6	6	dist/
7	7	.editorconfig
	8	+script-staging.sh
8	9
9	10	# ignore generated sprite
10		-src/assets/images/icons/sprite.png
11	11	\ No newline at end of file
	12	+src/assets/images/icons/sprite.png
...	...