Merge remote-tracking branch 'origin/master'

Browse Source

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

master

A1Gard 2 months ago

parent c902d89da7 6a2dafc22a

commit 2d3bb229c5

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