Merge branch 'beta-soon' into 'master' (8d9e0592) · Commits · BDE / nk20 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nk20
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8d9e0592

Commit 8d9e0592 authored 4 years ago by ynerant

Downloads
- Plain Diff

Merge branch 'beta-soon' into 'master'

Beta soon

See merge request !83

parents 8d704d07 518de596

No related branches found

No related tags found

1 merge request!83Beta soon

Pipeline #8216 passed with stages

in 4 minutes and 27 seconds

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

apps/permission/backends.py 5 additions, 6 deletions

apps/permission/backends.py
apps/permission/fixtures/initial.json 15 additions, 15 deletions

apps/permission/fixtures/initial.json
apps/permission/test.py 86 additions, 0 deletions

apps/permission/test.py
locale/fr/LC_MESSAGES/django.po 1 addition, 1 deletion

locale/fr/LC_MESSAGES/django.po
static/js/base.js 9 additions, 1 deletion

static/js/base.js
templates/activity/activity_detail.html 1 addition, 1 deletion

templates/activity/activity_detail.html

with 117 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment