Skip to content

Conversation

maxceem
Copy link

@maxceem maxceem commented Jan 7, 2017

No description provided.

# Conflicts:
#	package.json
#	src/components/Button/Button.scss
#	src/services/APIService.js
#	src/store/reducers.js
@gondzo gondzo changed the base branch from master to dev January 7, 2017 08:35
@gondzo gondzo merged commit 373ad96 into topcoderinc:dev Jan 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants