Merge (+ fix merge conflic) branch 'master' into development (7c6b049d) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7c6b049d

Commit 7c6b049d authored 7 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge (+ fix merge conflic) branch 'master' into development

parents ca42f445 467e0bcc

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

journals/templates/journals/_publication_card_content.html 6 additions, 1 deletion

journals/templates/journals/_publication_card_content.html
journals/templates/journals/_publication_details.html 13 additions, 7 deletions

journals/templates/journals/_publication_details.html
journals/templates/journals/_publication_details_small.html 3 additions, 1 deletion

journals/templates/journals/_publication_details_small.html
submissions/views.py 1 addition, 1 deletion

submissions/views.py

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

SciPost Code Repository