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
..
markdown_docs	Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery	2017-01-04 15:38:17 -05:00
mkdocs.yml	docs updates	2016-10-12 16:48:10 -04:00