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

..

danbooru

Merge pull request #551 from shish/contact-link

2016-06-06 12:37:27 +01:00

danbooru2

Merge pull request #551 from shish/contact-link

2016-06-06 12:37:27 +01:00

default

Merge pull request #551 from shish/contact-link

2016-06-06 12:37:27 +01:00

futaba

Merge pull request #551 from shish/contact-link

2016-06-06 12:37:27 +01:00

lite

jQuery.cookie is deprecated so use js-cookie instead (+ composer), some js tweaking too

2016-06-18 06:27:32 +01:00

material

jQuery.cookie is deprecated so use js-cookie instead (+ composer), some js tweaking too

2016-06-18 06:27:32 +01:00

warm

Merge pull request #551 from shish/contact-link

2016-06-06 12:37:27 +01:00