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
..
ajax	this does not belong here	2014-12-09 23:22:56 +01:00
answer	added show answer thing	2014-12-05 07:02:23 +01:00
devise	added shared links to devise views	2014-11-25 13:58:20 +01:00
inbox	Meymeys	2014-12-21 23:10:26 +01:00
layouts	icon bar animation shows up when you have new notifications	2014-12-20 01:37:05 +01:00
notifications	fixed link	2014-12-14 15:49:44 +01:00
public	hide left sidebar links on smallest screen size	2014-12-12 17:48:19 +01:00
question	splitting scss, pluralizing entries, etc	2014-12-09 15:32:29 +01:00
services	added layouts/messages to setting views	2014-12-13 16:03:18 +01:00
shared	Merge branch 'master' of git.rrerr.net:justask/justask	2014-12-27 00:40:02 +01:00
static	fluid	2014-12-13 18:24:50 +01:00
user	forgot the extra profile pages	2014-12-26 15:32:53 +01:00