merge fiy
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/fetsite/fetsite
merge gemfile.lock
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
is updated button für themen
Merge branch 'master' of https://github.com/fetsite/fetsite
button ausblenden wenn nicht eingeloggt
rechte für actions versions neuigkeiten
showversions, Neuigkeit
lva typ PR