Jeffry Degrande 132eec2c63 Merge branch 'upstream' ...

Conflicts:
	app/controllers/aspects_controller.rb

2010-09-29 02:11:20 -03:00

..

controllers

Merge branch 'upstream'

2010-09-29 02:11:20 -03:00

helpers

added a warning, moved connected as into a partial, removed the

2010-09-27 16:31:19 -07:00

models

moved user's public route to user controller. changed person.public_url to reflect change.

2010-09-27 22:30:16 -07:00

uploaders

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

views

photo partial now has labels

2010-09-28 13:05:58 -07:00