danielvincent 385e1673ab Merge branch 'master' into getting-started ... Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml		2010-10-26 16:50:57 -07:00
..
blueprint	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
brandongrotesque_light	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
sass	Merge branch 'master' into getting-started	2010-10-26 16:50:57 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00
fileuploader.css	Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.	2010-10-06 04:59:46 +08:00
loading.gif	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
tipsy.css	added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show	2010-10-23 22:21:51 -07:00