Skip to content

Commit

Permalink
Merge branch 'master' into rebranded
Browse files Browse the repository at this point in the history 
This is in order to use --strategy=ours to basically force rebranded
this to be the new master
  • Loading branch information
@devgeeks
devgeeks committed Dec 2, 2015
2 parents 140ee07 + ef5ebfb commit 6b52390
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 6b52390

Please sign in to comment.