Josh de Leeuw c575d03bdf Merge branch 'dev' ... Conflicts: docs/markdown_docs/features/data.md docs/markdown_docs/plugins/jspsych-survey-likert.md		2015-05-28 14:44:25 -04:00
..
about	update cite info	2015-02-18 18:37:33 -05:00
core_library	implements #121	2015-05-28 13:46:02 -04:00
css	adding documentation files	2014-10-15 17:44:41 -04:00
features	Merge branch 'dev'	2015-05-28 14:44:25 -04:00
img	add go/no-go task tutorial to docs	2014-11-06 09:44:03 -05:00
js	Set link protocol in docs to https	2015-03-29 15:41:11 +02:00
plugins	Merge branch 'dev'	2015-05-28 14:44:25 -04:00
tutorials	Set link protocol in docs to https	2015-03-29 15:41:11 +02:00
index.md	minor docs updates	2015-05-28 14:41:18 -04:00
support.md	add support doc	2014-10-16 10:28:31 -04:00