Merge remote-tracking branch 'origin/FixMaintenanceCounters' into develop

Browse Source

# Conflicts:
#	Client/View/NcWindow.cs

...

This commit is contained in:

Lucio Maranta

2019-08-20 08:37:30 +02:00

parent c78ad44588 ac20ecd8f1

commit 42eec885d0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available