Skip to content
This repository has been archived by the owner on Dec 23, 2017. It is now read-only.

Feature/add subtotals #255

Merged
merged 7 commits into from
Jun 10, 2015
Merged

Feature/add subtotals #255

merged 7 commits into from
Jun 10, 2015

Conversation

LindsayYoung
Copy link
Contributor

People thought the reports were wrong when the subtotals were not there. This adds the subtotals back in.

Fixes 18F/openFEC#937

This reverts commit df929eb.

Conflicts:
	templates/partials/committee-report-house-senate.html
	templates/partials/committee-report-pac-party.html
	templates/partials/committee-report-presidential.html
	templates/partials/committee-totals-house-senate.html
	templates/partials/committee-totals-pac-party.html
	templates/partials/committee-totals-presidential.html
@jmcarp
Copy link
Contributor

jmcarp commented Jun 10, 2015

LGTM. Just need to remove templates/.DS_Store from source control.

@LindsayYoung
Copy link
Contributor Author

Thanks for catching that!

@jmcarp jmcarp merged commit edeaa66 into develop Jun 10, 2015
@noahmanger noahmanger deleted the feature/add-subtotals branch August 3, 2015 22:51
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

3 participants