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
..
assets	fix margin if content is empty	2014-12-26 13:48:20 +01:00
controllers	Merge remote-tracking branch 'origin/inbox'	2014-12-21 15:33:03 +01:00
helpers	added notification_count	2014-12-14 15:15:15 +01:00
mailers	first commit	2014-08-01 11:23:47 +02:00
models	bio has now validation	2014-12-16 12:48:40 +01:00
views	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-27 00:40:02 +01:00
workers	alright	2014-12-12 23:45:49 +01:00