Li Chen a0657ff619 Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server ... Conflicts: onyx/include/team/exercice.php onyx/tpl/bootstrap/teams/exercice.tpl		2013-11-05 04:52:17 +01:00
..
Exercice.class.php	Exercice.class: fixed set_number	2013-11-05 04:41:50 +01:00
Member.class.php	New class Member, use it in Team ; update DB schema	2013-10-26 18:17:25 +02:00
Team.class.php	New templates	2013-11-04 23:20:16 +01:00
Theme.class.php	Theme.class: fixed get_exercicesOrdered	2013-11-05 04:42:47 +01:00