Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

ae1391c7

Commit ae1391c7 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !462

parents 63a8e7bc 41930894

No related branches found

No related tags found

3 merge requests!1061Development,!1046Patch,!462Development

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/MailController.php 6 additions, 0 deletions

app/Http/Controllers/MailController.php
app/Http/Controllers/MetaGerSearch.php 1 addition, 1 deletion

app/Http/Controllers/MetaGerSearch.php
app/MetaGer.php 36 additions, 22 deletions

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

app/Models/Result.php
resources/lang/en/503.php 6 additions, 0 deletions

resources/lang/en/503.php
resources/views/spende/spende.blade.php 1 addition, 1 deletion

resources/views/spende/spende.blade.php
resources/views/spende/spendenaufruf.blade.php 1 addition, 1 deletion

resources/views/spende/spendenaufruf.blade.php

with 52 additions and 26 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