Xavier Julián 76d07c2fd1 Merge branch 'master' into us-detail ... Conflicts: app/styles/main.scss		2014-06-23 13:09:24 +02:00
..
admin-membership.scss	admin membership layout	2014-06-23 11:49:56 +02:00
backlog.scss	Merge remote-tracking branch 'origin/master' into scssLint	2014-06-10 09:25:34 +02:00
base.scss	Fixed merge from master and updated files	2014-06-23 09:38:45 +02:00
kanban.scss	kanban front	2014-06-23 10:48:52 +02:00
taskboard.scss	f**ck infernal taskboard table	2014-06-09 19:22:17 +02:00
us-detail.scss	Sidebar options for User Story detail	2014-06-23 13:00:47 +02:00