Josh de Leeuw 0240b9f6c9 Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery ... # Conflicts: # plugins/jspsych-html.js		2017-01-04 15:38:17 -05:00
..
about	docs updates	2016-10-12 16:48:10 -04:00
core_library	more jquery removal	2016-11-28 14:59:32 -05:00
css	adding documentation files	2014-10-15 17:44:41 -04:00
features	Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery	2017-01-04 15:38:17 -05:00
img	docs updates for main page, theme, and timelines	2016-01-06 09:19:35 -05:00
js	Set link protocol in docs to https	2015-03-29 15:41:11 +02:00
plugins	Copy missing plugin examples to docs	2016-10-26 14:07:08 +02:00
tutorials	documentation updates for version 6	2016-10-13 13:34:33 -04:00
index.md	docs updates	2016-10-12 16:48:10 -04:00
support.md	docs updates	2016-10-12 16:48:10 -04:00