Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server

Conflicts:
	onyx/include/team/exercice.php
	onyx/tpl/bootstrap/teams/exercice.tpl
This commit is contained in:
Li Chen 2013-11-05 04:52:17 +01:00
commit a0657ff619
4 changed files with 31 additions and 2 deletions

View file

@ -105,7 +105,7 @@ else
{
$TEAM = intval(substr($p[0], 0, strpos($p[0], "-")));
$page = require("public/team.php");
$page = require("public/score.php");
}
}