Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	resources/views/segments/header/SimpleHeader/SimpleHeader.blade.php

master

A1Gard 8 months ago

parent b39b4a43d2 ce19cd3d77

commit 527cf862a9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available