Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
* origin/master:
  chore(grunt): improve publishing

Conflicts:
	Gruntfile.js
  • Loading branch information
@seriema
seriema committed Oct 5, 2015
2 parents cfe60af + 49c1309 commit 651465f
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 651465f

Please sign in to comment.