Connor Turland c6bc121fa0 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002		2013-01-05 12:51:48 -05:00
..
images	updated the edit description field, and the way that the card shows, and it stops the glitchy behaviour on topic editing	2013-01-05 12:50:19 -05:00
javascripts	Merge branch 'master' of github.com:Connoropolous/metamaps_gen002	2013-01-05 12:51:48 -05:00
stylesheets	updated the edit description field, and the way that the card shows, and it stops the glitchy behaviour on topic editing	2013-01-05 12:50:19 -05:00