diaspora/app/views
Raphael 1312728b88 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
2010-09-13 11:16:45 -07:00
..
albums Rename group to aspect 2010-09-13 10:38:38 -07:00
aspects Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
comments more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
devise cleaned login page resources 2010-09-08 23:30:08 -07:00
js Rename group to aspect 2010-09-13 10:38:38 -07:00
layouts Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 11:16:45 -07:00
people Rename group to aspect 2010-09-13 10:38:38 -07:00
photos Rename group to aspect 2010-09-13 10:38:38 -07:00
posts DG MS; hide debug info by default. also, made the text lighter. 2010-09-08 16:35:30 -07:00
publics RS IZ added a logger statement and a guid in the webfinger profile 2010-09-09 16:19:34 -07:00
requests Rename group to aspect 2010-09-13 10:38:38 -07:00
shared Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
status_messages fixed comments not showing for photos in stream 2010-08-26 11:08:03 -07:00
users MS; removing some dumb user stuff 2010-09-08 20:39:05 -07:00