ddejongh 497e43005e Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup ... Conflicts: css/main.css js/components/ascribe_table/table_item_subtable.js		2015-05-26 13:48:00 +02:00
..
ascribe-fonts	Some styling	2015-05-20 17:32:06 +02:00
main.css	Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup	2015-05-26 13:48:00 +02:00