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
..
admin	Display a confirmation message after the importation	2013-10-10 05:22:52 +02:00
common	Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server	2013-11-05 04:52:17 +01:00
public	Public part: home and team part	2013-10-26 08:59:59 +02:00
team	Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server	2013-11-05 04:52:17 +01:00
common.php	New class Member, use it in Team ; update DB schema	2013-10-26 18:17:25 +02:00
functions.php	Fix alert messages	2013-10-10 05:13:51 +02:00