nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
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
..
controllers Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
helpers Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
mailers notifier for the messages, we're so close 2011-03-08 10:53:49 -08:00
models Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
uploaders remove s3 setting 2011-01-17 16:46:39 -08:00
views Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00