Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
d839f31a
Commit
d839f31a
authored
7 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Plain Diff
Merge branch '684-metager-fanshop-verlinken' into 'development'
Resolve "MetaGer Fanshop Verlinken" Closes
#684
See merge request
!1174
parents
d5f22cc9
6893b752
No related branches found
Branches containing commit
No related tags found
1 merge request
!1365
Resolve "Filter Options for MetaGer"
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
composer.lock
+484
-357
484 additions, 357 deletions
composer.lock
resources/assets/less/metager/static-pages.less
+49
-27
49 additions, 27 deletions
resources/assets/less/metager/static-pages.less
resources/views/layouts/staticPages.blade.php
+29
-11
29 additions, 11 deletions
resources/views/layouts/staticPages.blade.php
with
562 additions
and
395 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment