diaspora/app
Raphael 950c6a7cab Merge branch '1.9.2' into HEAD
Conflicts:
	app/models/photo.rb
2010-09-24 14:36:00 -07:00
..
controllers Merge branch '1.9.2' into HEAD 2010-09-24 14:36:00 -07:00
helpers Revert "fix in person partial" 2010-09-23 16:21:08 -07:00
models Moving to activemodel validations 2010-09-24 11:15:39 -07:00
uploaders Spell our own name right 2010-09-15 17:56:18 -07:00
views Revert "fix in person partial" 2010-09-23 16:21:08 -07:00