Merge branch 'appointments-dev' into 'master' (9fb5e8f8) · 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

9fb5e8f8

Commit 9fb5e8f8 authored 8 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'appointments-dev' into 'master'

Appointments dev

See merge request !3

parents c4f36cb9 95c126eb

No related branches found

No related tags found

1 merge request!3Appointments dev

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java 1 addition, 1 deletion

...rc/main/java/smash/appointment/parse/PrcFlyingParser.java
smash/web/templates/visits/details.html 1 addition, 0 deletions

smash/web/templates/visits/details.html
smash/web/views.py 8 additions, 1 deletion

smash/web/views.py

with 10 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