Andrew Hart f7bec5285a Merge remote-tracking branch 'upstream/master' ... Conflicts: public/views/includes/header.html		2014-10-22 07:52:22 -07:00
..
css	fix layout for small devices	2014-10-22 09:23:59 -03:00
js	Merge remote-tracking branch 'upstream/master'	2014-10-22 07:52:22 -07:00