Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb

Browse Source

Conflicts:
	SRC/app/Http/Controllers/ReferentController.php
	SRC/public/css/game.css
	SRC/public/css/home.css
	SRC/resources/views/referent.blade.php
	SRC/resources/views/referent_games.blade.php

...

This commit is contained in:

www

2015-02-24 11:35:26 +01:00

parent 4f8e9f9a38 407a955444

commit 2fbbc8fe77

10 changed files with 246 additions and 30 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

BIN

SRC/public/pictures/pic/Game.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.6 KiB