nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
danielgrippi 648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
..
controllers Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
helpers Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
mailers request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
models Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
uploaders Make urls not change on processing 2011-03-21 18:42:36 -07:00
views Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00