jsPsych/docs/markdown_docs/features
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
..
callbacks.md add info about callback functions 2014-10-20 12:02:44 -04:00
chunks-blocks-trials.md adding documentation files 2014-10-15 17:44:41 -04:00
data.md Merge branch 'dev' 2015-05-28 14:44:25 -04:00
functions-as-parameters.md adding documentation files 2014-10-15 17:44:41 -04:00
image-preloading.md more docs updates 2014-10-17 10:48:39 -04:00
mturk.md more docs updates 2014-10-17 10:48:39 -04:00
progress-bar.md adding documentation files 2014-10-15 17:44:41 -04:00
randomization-repetition.md Update randomization-repetition.md 2014-10-16 20:46:28 -04:00
summary.md adding documentation files 2014-10-15 17:44:41 -04:00