zadam 4ae965c5cb Merge remote-tracking branch 'origin/stable' ...

# Conflicts:
#	src/public/app/widgets/collapsible_widgets/note_info.js

2020-06-04 22:37:04 +02:00

..

attribute.js

added autocompletes for labels, relations

2020-05-28 23:59:08 +02:00

branch.js

fix setup of new document, closes #966

2020-04-14 21:57:42 +02:00

note_complement.js

fix setup of new document, closes #966

2020-04-14 21:57:42 +02:00

note_short.js

prevent attribute inheritance cycle via template, closes #1077

2020-06-04 12:27:41 +02:00