mirror of
https://github.com/ascribe/onion.git
synced 2024-11-15 01:25:17 +01:00
23eb3a7fd9
Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan- Conflicts: ownership/serializers.py |
||
---|---|---|
.. | ||
application_actions.js | ||
coa_actions.js | ||
contract_actions.js | ||
contract_agreement_list_actions.js | ||
contract_list_actions.js | ||
edition_actions.js | ||
edition_list_actions.js | ||
event_actions.js | ||
global_notification_actions.js | ||
license_actions.js | ||
notification_actions.js | ||
ownership_actions.js | ||
piece_actions.js | ||
piece_list_actions.js | ||
prize_list_actions.js | ||
user_actions.js | ||
wallet_settings_actions.js | ||
whitelabel_actions.js |