nilsding 9fe8be1db8 Merge branch 'master' of git.rrerr.net:justask/justask ... Conflicts: app/views/shared/_answerbox.html.haml		2014-12-27 00:40:02 +01:00
..
_answerbox.html.haml	j	2014-12-27 00:39:03 +01:00
_answerbox_buttons.html.haml	remove that button	2014-12-27 00:37:42 +01:00
_comments.html.haml	rounded image was missing	2014-12-14 15:42:54 +01:00
_links.html.haml	…
_modal_ask_followers.html.haml	…
_question.html.haml	add link to question/answer in question display	2014-12-20 02:14:27 +01:00
_questionbox.html.haml	fixed text display for anon questionbox	2014-12-25 14:22:49 +01:00
_smiles.html.haml	fixed link	2014-12-14 15:58:39 +01:00
_userbox.html.haml	splitting scss, pluralizing entries, etc	2014-12-09 15:32:29 +01:00