marlabrizel / the_pivot

88%

master: 96%

LAST BUILD ON BRANCH clean-up

branch: clean-up

CHANGE BRANCH

x

Reset

• clean-up
• 102-placeholder-for-funding
• 11-company-admin-creates-projects
• 12-bs-admin-views-all-projects
• 13-ca-edit-delete-projects
• 14-company-admin-adds-collaborators
• 15-company-admin-manages-collaborators
• 37-user-checks-out
• 53-update-seeds
• 58-add-project-categories
• 63-admin-side-bar
• 68-company-admin-configuratinos
• 83-email-notifications
• admin-manages-former-collaborators
• admin-view-collaborators
• bootstrap-cart-view
• business-admin-projects
• change-db-name
• collab-cant-delete-others
• comments-helpers
• create-companies
• delete-test-stats
• empty-cart-#71
• featured-projects
• fix-bug-admin-view
• fix-flash
• fix-images
• fix-migations
• fix-permissions
• flash-hammer-time
• improve-test-coverage
• last-minute-cleanup
• master
• minor-cleanup
• nav-bar-partial
• nav-bar-pimpin
• pagination-projects
• register-user
• registered-user-funds-projects
• seed-file
• single-project-show
• style-hammer-time
• style-time
• template-mania
• test-cleanup
• tests-for-multitenancy
• tooling-setup
• tweaks
• update-account-info
• user-can-log-in
• user_funded_projects
• view-projects
• views-tear-down
• visits-landing-page-#5

merge master and resolve merge conflict in gemfile