Merge branch '156-confidential-issue' into 'development' (da9c9918) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

da9c9918

Commit da9c9918 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '156-confidential-issue' into 'development'

Adgoal eingefügt

Closes #156

See merge request !214

parents b7125fa5 2f713eac

No related branches found

No related tags found

Loading

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/Pictureproxy.php 8 additions, 2 deletions

app/Http/Controllers/Pictureproxy.php
app/MetaGer.php 67 additions, 0 deletions

app/MetaGer.php
app/Models/Result.php 1 addition, 1 deletion

app/Models/Result.php
public/css/styleResultPage.css 7 additions, 3 deletions

public/css/styleResultPage.css
resources/views/layouts/result.blade.php 8 additions, 8 deletions

resources/views/layouts/result.blade.php

with 91 additions and 14 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