Adolfo Gómez García 2bd4f3d8e5 Merge remote-tracking branch 'origin/v2.2'
# Conflicts:
#	server/src/uds/REST/methods/op_calendars.py
2019-01-18 08:34:47 +01:00
..
2018-01-05 14:46:14 +01:00
2018-10-17 10:33:24 +02:00
2018-01-05 14:46:14 +01:00
2018-11-13 13:18:19 +01:00
2018-10-29 23:54:05 +01:00