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_fetcher.js | ||
coa_fetcher.js | ||
edition_fetcher.js | ||
edition_list_fetcher.js | ||
license_fetcher.js | ||
notification_fetcher.js | ||
ownership_fetcher.js | ||
piece_fetcher.js | ||
piece_list_fetcher.js | ||
prize_list_fetcher.js | ||
s3_fetcher.js | ||
user_fetcher.js | ||
wallet_settings_fetcher.js | ||
whitelabel_fetcher.js |