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/app/views/layouts
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
..
application.html.erb Added config file system. 2011-10-11 12:28:33 +01:00
application.html.haml Added config file system. 2011-10-11 12:28:33 +01:00
categories.html.erb Everything is working well, categories and photos are a 1 to many right now though and they need to be many to many. 2010-10-08 13:15:18 -04:00
photos.html.erb Tweaked footer, added config. 2011-10-30 11:51:27 +00:00