Compare commits

...

16 commits

Author SHA1 Message Date
c8a359cfa3 Merge branch 'develop' into feature/splashscreen
Conflicts:
	index.html
2015-01-19 16:24:41 +01:00
cde3551077 Merge branch 'develop' into feature/splashscreen 2014-12-08 00:00:50 +01:00
afe6da4371 Merge branch 'develop' into feature/splashscreen 2014-12-05 22:38:05 +01:00
5c6b5a0e24 Merge branch 'develop' into feature/splashscreen 2014-12-05 21:07:42 +01:00
bebb0f306d Merge branch 'develop' into feature/splashscreen 2014-10-22 00:36:05 +02:00
6f3c4a8e6b Merge branch 'develop' into feature/splashscreen
Conflicts:
	index.html
	uhr.js
2014-09-03 15:38:00 +02:00
44345884a7 Merge branch 'develop' into feature/splashscreen 2014-06-30 15:48:48 +02:00
0aa50f1132 Merge branch 'develop' into feature/splashscreen
Conflicts:
	uhr-de_CH.js
2014-06-28 16:58:13 +02:00
8ba7f1ba0f Merge branch 'feature/splashscreen' of git.friedli.info:manuel/uhr into feature/splashscreen
Conflicts:
	index.html
2014-06-28 16:57:38 +02:00
d3e4f67b8b Merge branch 'develop' into feature/splashscreen 2014-06-28 14:21:26 +02:00
6ef4f36b07 Merge branch 'develop' into feature/splashscreen 2014-06-28 02:12:17 +02:00
1bdde279de temp commit, creating splash screen 2014-06-20 01:17:09 +02:00
ef073f9eb5 temp commit for logo-generation 2014-06-20 00:53:57 +02:00
99adf0f1eb Merge branch 'develop' into feature/splashscreen 2014-06-20 00:20:22 +02:00
5ccc66da8c Merge branch 'develop' into feature/splashscreen 2014-06-19 23:58:07 +02:00
3126af0018 temp commit 2014-05-09 15:06:20 +02:00

Diff content is not available