Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

fixtures

Make user_track use eventtracking

2015-05-06 20:57:46 -04:00

pages

Merge pull request #7802 from edx/gabe/user-track

2015-05-07 08:43:21 -04:00

performance

Fixed flaky test(s) - (SOL-336)

2015-03-27 14:48:36 +01:00

tests

Merge remote-tracking branch 'origin/release' into merge-release-to-master

2015-05-08 10:23:04 -04:00

__init__.py

Refactored bok-choy directory structure

2014-01-15 09:37:32 -05:00

.coveragerc

Omit migrations when calculating bok-choy coverage.

2015-04-06 16:52:27 -04:00

setup.py

Updated bok choy page objects setup.py

2014-02-04 14:32:42 -05:00