Merge branch 'bug/migration_problem_issue_236_devel' into 'master' (921fc993) · Commits · SMASCH / scheduling-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

scheduling-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- External wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

921fc993

Commit 921fc993 authored 6 years ago by Carlos Vega

Downloads
- Plain Diff

Merge branch 'bug/migration_problem_issue_236_devel' into 'master'

Bug/migration problem issue 236 devel

See merge request NCER-PD/scheduling-system!157

parents d587dde0 182716df

No related branches found

No related tags found

1 merge request!157Bug/migration problem issue 236 devel

Pipeline #6464 passed 6 years ago

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

local_settings_ci.py 5 additions, 0 deletions

local_settings_ci.py
requirements-dev.txt 1 addition, 1 deletion

requirements-dev.txt
requirements.txt 3 additions, 1 deletion

requirements.txt
smash/smash/local_settings.py.template 5 additions, 1 deletion

smash/smash/local_settings.py.template
smash/smash/settings.py 4 additions, 3 deletions

smash/smash/settings.py

with 18 additions and 6 deletions

Loading

Piotr Gawron @piotr.gawron
mentioned in commit f351078f
· 6 years ago

mentioned in commit f351078f

mentioned in commit f351078fb46728981845a00480dd2f23abb96390

Toggle commit list

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