Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

a7b17a62

Commit a7b17a62 authored 7 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'MetaGer-Redesign'

Development

See merge request !1067

parents 8bc9937a 010e7a91

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
.settings/.gitignore 2 additions, 0 deletions

.settings/.gitignore
app/Http/Controllers/StartpageController.php 9 additions, 9 deletions

app/Http/Controllers/StartpageController.php
app/Models/Result.php 1 addition, 1 deletion

app/Models/Result.php
resources/assets/js/scriptResultPage.js 2 additions, 1 deletion

resources/assets/js/scriptResultPage.js
resources/assets/less/metager/result-page.less 21 additions, 1 deletion

resources/assets/less/metager/result-page.less

with 37 additions and 12 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