Commit graph

2 commits

Author SHA1 Message Date
Daku
caed53de6a jQuery.cookie is deprecated so use js-cookie instead (+ composer), some js tweaking too
Conflicts:
	ext/blotter/script.js
	ext/handle_pixel/script.js
	ext/index/script.js
	ext/pools/script.js
	lib/shimmie.js
2016-06-18 06:27:32 +01:00
William Crandell
6fb43eab19 On Develop branch
Sorry about that
2015-10-26 08:51:02 -04:00