Synnefo » astakos

Revision 8f7cca2b

ID	8f7cca2b858869c8d58e91db5b39dda4269c442c

Added by Sofia Papagiannaki almost 12 years ago

Merge remote-tracking branch 'origin' into quota

Conflicts:
snf-astakos-app/astakos/im/api/admin.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/management/commands/add_terms.py
snf-astakos-app/astakos/im/management/commands/addgrouppermissions.py
snf-astakos-app/astakos/im/management/commands/addterms.py
snf-astakos-app/astakos/im/management/commands/createuser.py
snf-astakos-app/astakos/im/management/commands/group_add_permissions.py
snf-astakos-app/astakos/im/management/commands/group_list.py
snf-astakos-app/astakos/im/management/commands/group_listing.py
snf-astakos-app/astakos/im/management/commands/group_permissions_add.py
snf-astakos-app/astakos/im/management/commands/group_premissions_remove.py
snf-astakos-app/astakos/im/management/commands/group_remove_permissions.py
snf-astakos-app/astakos/im/management/commands/invitation_list.py
snf-astakos-app/astakos/im/management/commands/invitation_listing.py
snf-astakos-app/astakos/im/management/commands/listgroups.py
snf-astakos-app/astakos/im/management/commands/listinvitations.py
snf-astakos-app/astakos/im/management/commands/listservices.py
snf-astakos-app/astakos/im/management/commands/listusers.py
snf-astakos-app/astakos/im/management/commands/modifyuser.py
snf-astakos-app/astakos/im/management/commands/registerservice.py
snf-astakos-app/astakos/im/management/commands/removegrouppermissions.py
snf-astakos-app/astakos/im/management/commands/renewservicetoken.py
snf-astakos-app/astakos/im/management/commands/service_add.py
snf-astakos-app/astakos/im/management/commands/service_list.py
snf-astakos-app/astakos/im/management/commands/service_listing.py
snf-astakos-app/astakos/im/management/commands/service_register.py
snf-astakos-app/astakos/im/management/commands/service_remove.py
snf-astakos-app/astakos/im/management/commands/service_renew_token.py
snf-astakos-app/astakos/im/management/commands/service_token_renew.py
snf-astakos-app/astakos/im/management/commands/service_unregister.py
snf-astakos-app/astakos/im/management/commands/term_add.py
snf-astakos-app/astakos/im/management/commands/unregisterservice.py
snf-astakos-app/astakos/im/management/commands/user_add.py
snf-astakos-app/astakos/im/management/commands/user_create.py
snf-astakos-app/astakos/im/management/commands/user_list.py
snf-astakos-app/astakos/im/management/commands/user_listing.py
snf-astakos-app/astakos/im/management/commands/user_modify.py
snf-astakos-app/astakos/im/management/commands/user_update.py
snf-astakos-app/astakos/im/views.py

Files

• added
• modified
• copied
• renamed
• deleted