Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c13c64b 1f631c7)

commit	7f42ee92eb715dfb7cbd4fb7d27dd8450482ec20
author	Dan Poltawski <dan@moodle.com>
	Mon, 10 Mar 2014 05:45:26 +0000 (10 13:45 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Mon, 10 Mar 2014 05:45:26 +0000 (10 13:45 +0800)
tree	5e94b261aa798493bb7b936a3c73cd3531e0e891	tree \| snapshot (tar.gz zip)
parent	c13c64b0e11ebb005582fb2b4d6161de3568a851	commit \| diff
parent	1f631c7c6335348e3781eab6c7ee7760ecd41721	commit \| diff

Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle

15 files changed:

admin/tests/behat/upload_users.feature	diff1 \|	diff2 \|	blob \| history
admin/tool/behat/tests/behat/basic_actions.feature	diff1 \|	diff2 \|	blob \| history
admin/tool/behat/tests/behat/manipulate_forms.feature	diff1 \|	diff2 \|	blob \| history
admin/tool/behat/tests/behat/nasty_strings.feature	diff1 \|	diff2 \|	blob \| history
admin/tool/uploadcourse/tests/behat/create.feature	diff1 \|	diff2 \|	blob \| history
admin/tool/uploadcourse/tests/behat/update.feature	diff1 \|	diff2 \|	blob \| history
auth/tests/behat/login.feature	diff1 \|	diff2 \|	blob \| history
badges/tests/behat/award_badge.feature	diff1 \|	diff2 \|	blob \| history
blocks/activity_modules/tests/behat/block_activity_modules.feature	diff1 \|	diff2 \|	blob \| history
blocks/tests/behat/manage_blocks.feature	diff1 \|	diff2 \|	blob \| history
cohort/tests/behat/add_cohort.feature	diff1 \|	diff2 \|	blob \| history
cohort/tests/behat/upload_cohort_users.feature	diff1 \|	diff2 \|	blob \| history
lib/tests/behat/behat_permissions.php	diff1 \|	diff2 \|	blob \| history
mod/forum/tests/behat/track_read_posts.feature	diff1 \|	diff2 \|	blob \| history
repository/upload/tests/behat/upload_file.feature	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS