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
969b7ecf5d
danbarberphoto/public
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
..
admin Removed localised paperclip plugin and added the gem. Added :preview 2010-12-20 12:11:07 -05:00
404.html First commit. 2011-10-10 15:39:52 +01:00
422.html First commit. 2011-10-10 15:39:52 +01:00
500.html First commit. 2011-10-10 15:39:52 +01:00
favicon.ico First commit. 2011-10-10 15:39:52 +01:00
index.html_ Moved project over to rails 3.1.1. Removed Typus and now need to add new 2011-10-30 11:40:57 +00:00
robots.txt First commit. 2011-10-10 15:39:52 +01:00