danielvincent 3e5cecd532 Merge branch 'master' into group-top ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-08-02 16:09:13 -07:00
..
controllers	DG IZ; time_created_at uses published_at instead of created_at for OstatusPost	2010-07-29 20:43:03 -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	RS; posted statuses now use the websocket to update latest, time is now styled right	2010-08-02 11:13:21 -07:00
uploaders	RS; Image filename is now the Photo model id	2010-08-02 10:05:34 -07:00
views	Merge branch 'master' into group-top	2010-08-02 16:09:13 -07:00