danielgrippi 1f5edb1d92 Merge branch 'private_messages' ... Conflicts: app/controllers/status_messages_controller.rb app/models/data_point.rb app/models/status_message.rb db/schema.rb lib/fake.rb public/stylesheets/sass/application.sass spec/models/mention_spec.rb		2011-03-08 21:23:41 -08:00
..
blueprint	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
sass	Merge branch 'private_messages'	2011-03-08 21:23:41 -08:00
vendor	cleaned up new message facebox	2011-03-07 20:14:22 -08:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00