Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

Browse Source

 Conflicts:

	skolehjem/resources/views/app/layout/base.blade.php

...

This commit is contained in:

frederikpyt

2020-08-05 09:17:44 +02:00

parent ee3caae76a 90a36d85b9

commit 07fa636a2e

5 changed files with 20 additions and 8 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

skolehjem/public/images/icons/facebook-icon.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.7 KiB

skolehjem/public/images/icons/instagram.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 34 KiB After Width:  |  Height:  |  Size: 58 KiB

skolehjem/public/images/icons/yt.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.6 KiB After Width:  |  Height:  |  Size: 3.4 KiB