Sagi Dayan 354d194f32 Merge branch 'master' into API_Dev ... Conflict Fixed		2015-06-16 23:39:31 +03:00
..
__init__.py	First Commit	2015-05-09 22:00:14 +03:00
Campus.py	-var name change in campus	2015-06-11 21:01:05 +03:00
Course.py	removed project list from course and added course to project	2015-06-15 18:34:02 +03:00
Project.py	removed project list from course and added course to project	2015-06-15 18:34:02 +03:00
Task.py	Added models: Project, Course, Task.	2015-06-10 21:39:42 +03:00
User.py	Merge branch 'master' into API_Dev	2015-06-16 23:39:31 +03:00