Skip to content
This repository has been archived by the owner on Feb 1, 2019. It is now read-only.

bringing back the un-dead #10

Merged
merged 2 commits into from
Aug 6, 2015
Merged

bringing back the un-dead #10

merged 2 commits into from
Aug 6, 2015

Conversation

imuchnik
Copy link
Member

@imuchnik imuchnik commented Aug 6, 2015

and all other jazzzzzz

@Ooblioob
Copy link
Contributor

Ooblioob commented Aug 6, 2015

Looks good to me

Conflicts:
	dist/index.html
	dist/js/app.min-1c6411a4.js
	dist/js/app.min-2467c18d.js
	dist/js/app.min-c87ab3f8.js
@imuchnik
Copy link
Member Author

imuchnik commented Aug 6, 2015

Merged - checking in dist found harmful

@Ooblioob
Copy link
Contributor

Ooblioob commented Aug 6, 2015

Ah, noted. We'll have to examine looking into building during deployment more urgently...

Ooblioob added a commit that referenced this pull request Aug 6, 2015
bringing back the un-dead
@Ooblioob Ooblioob merged commit 5e53794 into cfpb:master Aug 6, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants