Merge remote-tracking branch 'upstream/pull/2160'

Browse source

...

This commit is contained in:

Tom Hughes 2019-02-28 18:58:05 +00:00

parent 4543e85441 f4e2990526

commit 73214da35d

18 changed files with 858 additions and 723 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

0

app/views/api/capabilities.builder → app/views/api/capabilities/show.builder

Unescape Escape View file

0

app/views/api/permissions.builder → app/views/api/permissions/show.builder

Unescape Escape View file