Merge branch '37-piwik-integration' into 'development' (1349d054) · 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

1349d054

Commit 1349d054 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '37-piwik-integration' into 'development'

Piwikintegration eingebaut

Closes #37

See merge request !131

parents 60ee8b1c 0b30b30f

No related branches found

No related tags found

Loading

Changes 7
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/ImageController.php 35 additions, 0 deletions

app/Http/Controllers/ImageController.php
app/Http/routes.php 2 additions, 0 deletions

app/Http/routes.php
composer.json 2 additions, 1 deletion

composer.json
composer.lock 42 additions, 2 deletions

composer.lock
public/img/1px.png 0 additions, 0 deletions

public/img/1px.png
resources/views/layouts/resultPage.blade.php 1 addition, 0 deletions

resources/views/layouts/resultPage.blade.php
resources/views/layouts/staticPages.blade.php 2 additions, 1 deletion

resources/views/layouts/staticPages.blade.php

with 84 additions and 4 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