Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

4f07df0d

Commit 4f07df0d authored 6 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 798-redesign-the-assoziator

parents 37585753 9349f092

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/StartpageController.php 11 additions, 0 deletions

app/Http/Controllers/StartpageController.php
app/Http/Middleware/HumanVerification.php 2 additions, 1 deletion

app/Http/Middleware/HumanVerification.php
resources/assets/js/lib/imagesloaded.js 0 additions, 7 deletions

resources/assets/js/lib/imagesloaded.js
resources/assets/js/lib/openpgp.min.js 0 additions, 7 deletions

resources/assets/js/lib/openpgp.min.js
resources/assets/less/metager/general.less 2 additions, 2 deletions

resources/assets/less/metager/general.less
resources/views/index.blade.php 3 additions, 3 deletions

resources/views/index.blade.php
resources/views/layouts/resultPage.blade.php 3 additions, 4 deletions

resources/views/layouts/resultPage.blade.php
webpack.mix.js 46 additions, 20 deletions

webpack.mix.js

with 67 additions and 44 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