Merge remote-tracking branch...
Merge remote-tracking branch 'origin/832-make-graphql-graphene-mutations-actually-return-error-messages' into 831-data-management-for-the-model-room # Conflicts: # CHANGELOG.rst
Showing
- CHANGELOG.rst 1 addition, 0 deletionsCHANGELOG.rst
- aleksis/core/frontend/components/calendar_feeds/Birthdays2.vue 47 additions, 0 deletions...is/core/frontend/components/calendar_feeds/Birthdays2.vue
- aleksis/core/settings.py 1 addition, 0 deletionsaleksis/core/settings.py
- aleksis/core/urls.py 1 addition, 1 deletionaleksis/core/urls.py
- aleksis/core/views.py 7 additions, 0 deletionsaleksis/core/views.py
Loading
Please register or sign in to comment