Merge branch 'develop' into feature/splashscreen

This commit is contained in:
Manuel Friedli 2014-12-05 22:38:05 +01:00
commit afe6da4371
7 changed files with 151 additions and 56 deletions

View file

@ -43,6 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<script type="text/javascript" src="js/uhr-it.js"></script>
<script type="text/javascript" src="js/uhr-es.js"></script>
<script type="text/javascript" src="js/uhr-nl.js"></script>
<script type="text/javascript" src="js/uhr-dk.js"></script>
<script type="text/javascript">
function go(url) {
window.location = url;