Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

a366b35b

Commit a366b35b authored 6 years ago by Hangzhi Yu

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev' into dev

parents 8df5ac3b be969a8d

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.idea/dataSources.local.xml 3 additions, 3 deletions

.idea/dataSources.local.xml
.idea/misc.xml 1 addition, 1 deletion

.idea/misc.xml
.idea/school-apps.iml 1 addition, 1 deletion

.idea/school-apps.iml
.idea/vcs.xml 0 additions, 1 deletion

.idea/vcs.xml
schoolapps/aub/filters.py 4 additions, 2 deletions

schoolapps/aub/filters.py
schoolapps/aub/models.py 13 additions, 20 deletions

schoolapps/aub/models.py
schoolapps/templates/partials/header.html 1 addition, 1 deletion

schoolapps/templates/partials/header.html

with 23 additions and 29 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