|
|
805b952281
|
Merge branch 'master' into API_Dev
Conflicts:
Testing/CoursesAPI_test.py
|
2015-06-28 21:14:09 +03:00 |
|
Matan Bar Yosef
|
3486581b8f
|
- myClasses display - (python work in progress)
- layout patterns fixed and adjusted
|
2015-06-28 15:27:06 +03:00 |
|
|
|
18ad25f18d
|
MERGE WARNING!!
deleted CourseAPI_test from my rep. i think this file doesnt exist in @etyemy rep aswell
|
2015-06-24 21:57:31 +03:00 |
|
|
|
0a02aaf692
|
Reverting Arans commit on testing
|
2015-06-23 19:55:58 +03:00 |
|
|
|
6b8debec47
|
MERGE WARNING!
didnt touch it but it wants commit...
|
2015-06-23 00:13:03 +03:00 |
|
etyemyer
|
dbf160a7b9
|
Updated tests and added deleted tests
|
2015-06-21 23:19:44 +03:00 |
|
