Merge branch 'master' into import_nk15 (0db28814) · 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

0db28814

Commit 0db28814 authored 5 years ago by Pierre-antoine Comby

Downloads
- Plain Diff

Merge branch 'master' into import_nk15

parents c5ebd029 8c364c76

No related branches found

No related tags found

1 merge request!19Import nk15

Changes 68

Expand all Hide whitespace changes

Inline Side-by-side

Showing

static/favicon/mstile-150x150.png 0 additions, 0 deletions

static/favicon/mstile-150x150.png
static/favicon/safari-pinned-tab.svg 1 addition, 1 deletion

static/favicon/safari-pinned-tab.svg
templates/base.html 37 additions, 34 deletions

templates/base.html
templates/member/manage_auth_tokens.html 33 additions, 0 deletions

templates/member/manage_auth_tokens.html
templates/member/profile_detail.html 65 additions, 53 deletions

templates/member/profile_detail.html
templates/member/profile_update.html 11 additions, 12 deletions

templates/member/profile_update.html
templates/note/conso_form.html 97 additions, 0 deletions

templates/note/conso_form.html
tox.ini 10 additions, 12 deletions

tox.ini

with 254 additions and 112 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