 Lars van Hijfte
|
0b67cfe28a
|
Merge branch 'master' into lars-algemeen
|
2017-01-12 15:13:38 +01:00 |
|
 Marijn Jansen
|
8b0ce920d7
|
Merge branch 'joey-testing' into 'master'
fixed identation
See merge request !24
|
2017-01-12 15:04:26 +01:00 |
|
|
Marijn Jansen
|
e9c883529b
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/login.php
|
2017-01-12 15:04:07 +01:00 |
|
|
Marijn Jansen
|
c15643128a
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !26
|
2017-01-12 15:02:51 +01:00 |
|
|
Marijn Jansen
|
4b900b3721
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !25
|
2017-01-12 14:50:39 +01:00 |
|
|
Marijn Jansen
|
2bc11a87e4
|
Added Email settings
|
2017-01-12 14:49:11 +01:00 |
|
|
Marijn Jansen
|
10558a6877
|
Merge branch 'master' into marijn-settings
|
2017-01-12 14:21:28 +01:00 |
|
|
Marijn Jansen
|
eeedbe5c05
|
More fields
|
2017-01-12 14:19:08 +01:00 |
|
 Joey Lai
|
4cb9a83d62
|
fixed identation
|
2017-01-12 14:18:49 +01:00 |
|
|
Marijn Jansen
|
b82ac7ec59
|
More settings
|
2017-01-12 12:12:54 +01:00 |
|
|
Marijn Jansen
|
06c24ec096
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings
|
2017-01-12 11:36:26 +01:00 |
|
|
Marijn Jansen
|
319a406d6f
|
Added settings page.
|
2017-01-12 11:00:44 +01:00 |
|