Merge branch 'feature/AttributeSet' into feature/b931

Browse Source

# Conflicts:
#	core/attributedef.class.inc.php

...

This commit is contained in:

Eric

2018-09-27 15:29:27 +02:00

parent 741e88e1f0 2a6a97526d

commit 5559c8205f

19 changed files with 1258 additions and 455 deletions

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

808

core/attributedef.class.inc.php

File diff suppressed because it is too large Load Diff