Merge remote-tracking branch 'origin/stable'

Browse Source

# Conflicts:
#	src/public/javascripts/services/note_detail_code.js

...

This commit is contained in:

zadam

2020-03-10 22:51:02 +01:00

parent 72745aca29 5b67854cbe

commit dc4024b6de

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