Will Bradley d3b8ad7222 Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface ...

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/door_logs_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/door_logs/download.html.erb
	app/views/door_logs/show.html.erb
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb
	app/views/users/upload.html.erb
	app/views/users/upload_all.html.erb
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb
	db/schema.rb

2012-09-15 17:34:55 -07:00

..

assets

Installed Devise and created a home controller/route

2012-09-02 02:57:34 -07:00

controllers

Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

2012-09-15 17:34:55 -07:00

helpers

Installed Devise and created a home controller/route

2012-09-02 02:57:34 -07:00

mailers

Surprise Rails app!

2012-08-30 23:54:25 -07:00

models

Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

2012-09-15 17:34:55 -07:00

views

Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

2012-09-15 17:34:55 -07:00