Marijn Jansen
|
6142e93957
|
Merge branch 'master' into 'marijn-appje'
# Conflicts:
# app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
|
2017-06-26 15:21:20 +02:00 |
|
Marijn Jansen
|
03d4244daf
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !15
|
2017-06-26 11:37:03 +02:00 |
|
Marijn Jansen
|
766711faee
|
Merge branch 'niels-notulen' into 'master'
Niels notulen
See merge request !14
|
2017-06-26 10:54:12 +02:00 |
|
Marijn Jansen
|
046b04e83a
|
Merge branch 'niels-logboek' into 'master'
Niels logboek
See merge request !13
|
2017-06-26 10:53:27 +02:00 |
|
Felix Atsma
|
801acc24fa
|
Merge branch 'felix' into 'master'
Camera filter switching and uploading
See merge request !12
|
2017-06-26 10:51:41 +02:00 |
|
Felix Atsma
|
d3d5a41037
|
Merge remote-tracking branch 'origin/master' into felix
|
2017-06-26 10:51:36 +02:00 |
|
Felix Atsma
|
d90a878a58
|
Camera filter switching and uploading
|
2017-06-26 10:43:59 +02:00 |
|
Niels Zwemmer
|
8678cc9111
|
Added today and yesterday's entries. Forgot about adding the meeting. It is now added.
|
2017-06-24 20:58:00 +02:00 |
|
Niels Zwemmer
|
cc1b83b0e0
|
Added today and yesterday's entries.
|
2017-06-24 20:24:09 +02:00 |
|
Niels Zwemmer
|
06eb90bc9f
|
Added council minutes of today.
|
2017-06-23 13:14:15 +02:00 |
|
Niels Zwemmer
|
d7dcaa6c29
|
Added today's log entry.
|
2017-06-22 20:53:01 +02:00 |
|
Niels Zwemmer
|
08ec6e3ee8
|
Added updated log file.
|
2017-06-21 15:52:15 +02:00 |
|
Niels Zwemmer
|
86ab31a681
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/TheReturnOfTheMyHyvesBookPlus into niels-notulen
|
2017-06-21 11:08:10 +02:00 |
|
Niels Zwemmer
|
39a48044d3
|
Removed produced PDF of counsil minutes and replaced it with .tex file. Also, added a new .tex file for today's meeting.
|
2017-06-20 19:53:56 +02:00 |
|
Niels Zwemmer
|
f3ee792d22
|
Added today's log
|
2017-06-20 19:21:30 +02:00 |
|
Niels Zwemmer
|
01a27d8a95
|
Added logboek template
|
2017-06-20 14:39:37 +02:00 |
|
Niels Zwemmer
|
7eab8f2257
|
First, unofficial council minutes.
|
2017-06-13 20:10:26 +02:00 |
|