jdescottes 8a29b78af8 Merge branch 'master' into enhancement-palette-sorting ... Conflicts: src/js/utils/FrameUtils.js		2014-09-21 21:56:22 +02:00
..
FrameUtilsTest.js	added FrameUtils unit tests	2014-09-21 21:39:54 +02:00
UuidTest.js	Palette creator can save palettes to local storage	2014-09-06 12:37:11 +02:00