Commit 9d049266 authored by Rejo Zenger's avatar Rejo Zenger

Merge branch 'master' into '21-cleanup-initial-mep-roulette-view'

# Conflicts:
#   app/dict/en.php
parents 076a4b0c c5d1c7d6
......@@ -5,7 +5,7 @@ return array(
'meme.panel2.text' => 'An uploadfilter cannot recognize your legal use of copyrighted content.',
'meme.panel2.sub' => '(Like parody, citations and - oh, noes! - memes.)',
'meme.panel3.text' => 'And you will have no meaningful protection from unfair deletion.',
'meme.panel3.sub' => '(So, the proposed safeguards will not safe you.)',
'meme.panel3.sub' => '(So, the proposed safeguards will not save you.)',
'meme.panel4.text' => 'This needs to change: we need to save the meme!',
'meme.panel4.sub' => '(Article 13 of the proposed Copyright Directive must be deleted.)',
'meme.panel5.text' => 'And you can be of a tremendous help!',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment