danbarber/danbarberphoto
1
0
Fork 0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00
Code Issues Releases Wiki Activity
08170ec5e0
danbarberphoto/db
History
Dan Barber 08170ec5e0 Merge ../template into 3.1_upgrade 
Conflicts:
	.gitignore
	.rvmrc
	Gemfile
	Gemfile.lock
	README
	Rakefile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/admin/admin_users_controller.rb
	app/controllers/application_controller.rb
	app/models/admin_user.rb
	config.ru
	config/application.rb
	config/config.yml
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
2011-10-30 12:15:13 +00:00
..
migrate Merge ../template into 3.1_upgrade 2011-10-30 12:15:13 +00:00
data.yml Added S3 storage for photos. 2011-10-28 12:33:56 +01:00
schema.rb Merge ../template into 3.1_upgrade 2011-10-30 12:15:13 +00:00
seeds.rb First commit. 2011-10-10 15:39:52 +01:00