Maxwell Salzberg c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown ... Conflicts: Gemfile.lock		2011-08-27 14:13:15 -07:00
..
_status_message.haml	Improve code block support	2011-08-16 21:48:48 -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