mirror of
https://github.com/ascribe/onion.git
synced 2024-12-22 17:33:14 +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_store.js | ||
coa_store.js | ||
contract_agreement_list_store.js | ||
contract_list_store.js | ||
contract_store.js | ||
edition_list_store.js | ||
edition_store.js | ||
global_notification_store.js | ||
license_store.js | ||
notification_store.js | ||
ownership_store.js | ||
piece_list_store.js | ||
piece_store.js | ||
prize_list_store.js | ||
user_store.js | ||
wallet_settings_store.js | ||
whitelabel_store.js |