Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

264d7307

Commit 264d7307 authored 8 years ago by Karl Hasselbring

Downloads
- Plain Diff

Merge branch '110-deutsche-seite-hilfe-faq-uberarbeiten' into 'development'

Resolve "Deutsche Seite (Hilfe & faq) überarbeiten"



See merge request !343

parents 9101dc2e 257599cd

No related branches found

No related tags found

1 merge request!1365Resolve "Filter Options for MetaGer"

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/Http/routes.php 9 additions, 1 deletion

app/Http/routes.php
resources/lang/de/staticPages.php 30 additions, 28 deletions

resources/lang/de/staticPages.php
resources/lang/de/titles.php 1 addition, 0 deletions

resources/lang/de/titles.php
resources/lang/en/staticPages.php 28 additions, 25 deletions

resources/lang/en/staticPages.php
resources/lang/en/titles.php 1 addition, 0 deletions

resources/lang/en/titles.php
resources/views/faq.blade.php 99 additions, 0 deletions

resources/views/faq.blade.php
resources/views/hilfe.blade.php 26 additions, 109 deletions

resources/views/hilfe.blade.php
resources/views/layouts/staticPages.blade.php 9 additions, 1 deletion

resources/views/layouts/staticPages.blade.php

with 203 additions and 164 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