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