danielvincent c78b111fec Merge branch 'master' into group-top		2010-08-03 16:42:33 -07:00
..
controllers	Moved utilities out to special controller, took pound sign out of database name	2010-08-02 18:03:16 -07:00
helpers	RS; posted statuses now use the websocket to update latest, time is now styled right	2010-08-02 11:13:21 -07:00
models	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing	2010-08-02 17:27:45 -07:00