5 Commits

Author	SHA1	Message	Date
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
Josh de Leeuw	7051e3354f	implements #121	2015-05-28 13:46:02 -04:00
Josh de Leeuw	9acb625d21	fixes #132	2015-05-15 16:33:34 -04:00
Josh de Leeuw	22748866b3	update example php ... issue #110	2015-02-18 11:22:43 -05:00
Josh de Leeuw	a3cd98921c	adding documentation files	2014-10-15 17:44:41 -04:00