Okechi Onyeje edfee4bc8a Merge remote-tracking branch 'refs/remotes/Pearlception_Website/addViewForViewData' ...

Conflicts:
	Pearlception/app/views/layouts/application.html.erb
	Pearlception/config/routes.rb

2017-01-19 09:31:30 -05:00

..

application_controller_renderer.rb

initial rails setup

2017-01-03 15:41:29 -05:00

assets.rb

Add dashboard view

2017-01-12 16:15:37 -05:00

backtrace_silencers.rb

initial rails setup

2017-01-03 15:41:29 -05:00

cookies_serializer.rb

initial rails setup

2017-01-03 15:41:29 -05:00

devise.rb

set up devise for sign up and login

2017-01-09 13:46:23 -05:00

filter_parameter_logging.rb

initial rails setup

2017-01-03 15:41:29 -05:00

inflections.rb

initial rails setup

2017-01-03 15:41:29 -05:00

mime_types.rb

initial rails setup

2017-01-03 15:41:29 -05:00

new_framework_defaults.rb

initial rails setup

2017-01-03 15:41:29 -05:00

session_store.rb

initial rails setup

2017-01-03 15:41:29 -05:00

wrap_parameters.rb

initial rails setup

2017-01-03 15:41:29 -05:00