Merge branch 'master' into 81-email-to-technician (af6c9423) · 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

af6c9423

Commit af6c9423 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'master' into 81-email-to-technician

parents 9f699d1a 14f33c68

No related branches found

No related tags found

1 merge request!47Resolve "Email to technician"

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

smash/web/migrations/0041_language_windows_locale_name.py 20 additions, 0 deletions

smash/web/migrations/0041_language_windows_locale_name.py
smash/web/migrations/0042_auto_20170613_1634.py 20 additions, 0 deletions

smash/web/migrations/0042_auto_20170613_1634.py
smash/web/models/language.py 2 additions, 0 deletions

smash/web/models/language.py
smash/web/models/mail_template.py 5 additions, 1 deletion

smash/web/models/mail_template.py
smash/web/tests/test_process_file.py 5 additions, 1 deletion

smash/web/tests/test_process_file.py

with 52 additions and 2 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