arieldiamond / planit

65%

master: 30%

LAST BUILD ON BRANCH devise_invitable

branch: devise_invitable

CHANGE BRANCH

x

Reset

• devise_invitable
• June-18-8pm
• UI
• UI-ariel
• UI-merge
• UI-tons-of-it
• UI-with-bootstrap
• activities_calendar
• add_expenses_to_trip_page
• adding_expenses_query
• ajax
• all_mobile_custom_controllers
• attempt_to_push
• basic_views
• boat_pic
• building_mobile_signup_api
• calendar
• capybara
• child-UI-merge
• cleanup
• css
• css_heroku_issue
• de_boot
• design
• development
• dusty_mobile_prep
• expense_string_display
• finishing_in_app_invites
• fix_heroku_loading
• fix_polls_spec
• fix_trip_view
• fixed_small_typo
• fixing_dates
• fixmaploading
• in_app_invites
• invitations
• invites
• javascript
• js_validations
• links
• mailers
• map_calendar
• map_display
• map_revisions
• maps_js
• master
• messing_with_modals
• mobile_prep
• money
• money_polishing
• money_polishing2
• money_validations
• more_maps_2
• more_voting
• new_seed_file
• polish
• poll_edit
• prepping_controller_for_mobile_requests
• route_typo
• scaffolding
• still_fixing_params
• test_expense_ui
• travis
• trips
• trips_crud
• user_seeds
• voting_gem
• voting_partial
• working_seed_file

resolving conflict