Merge branch 'develop' into feature/splashscreen

This commit is contained in:
Manuel Friedli 2014-12-05 21:07:42 +01:00
commit 5c6b5a0e24
7 changed files with 174 additions and 4 deletions

View file

@ -41,6 +41,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<script type="text/javascript" src="js/uhr-en.js"></script>
<script type="text/javascript" src="js/uhr-fr.js"></script>
<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">
function go(url) {
window.location = url;