nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/status_messages
History
Dan Hansen 3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
2011-08-20 14:40:56 -05:00
..
_status_message.haml merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
bookmarklet.html.haml Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 2011-08-20 14:40:56 -05:00
create.js.erb not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
new.haml Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 2011-08-18 16:48:20 -07:00