maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	.gitignore
#	src/vendor/composer/autoload_static.php
This commit is contained in:
alext 2017-07-17 22:59:57 +02:00
commit e202abc82b
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.gitignore vendored
View file

@ -1,21 +1,21 @@
*.zip /*.zip
.idea/ /.idea/
.tmp-package/ /.tmp-package/
doc/apigen/ /doc/apigen/
doc/jsdoc/ /doc/jsdoc/
doc/plato/ /doc/plato/
node_modules/ /node_modules/
npm-debug.log /npm-debug.log
src/config.php /src/config.php
src/storage/cache/* /src/storage/cache/*
!src/storage/cache/.htaccess !/src/storage/cache/.htaccess
!src/storage/cache/index.html !/src/storage/cache/index.html
src/storage/logs/* /src/storage/logs/*
!src/storage/logs/.htaccess !/src/storage/logs/.htaccess
!src/storage/logs/index.html !/src/storage/logs/index.html
src/storage/sessions/* /src/storage/sessions/*
!src/storage/sessions/.htaccess !/src/storage/sessions/.htaccess
!src/storage/sessions/index.html !/src/storage/sessions/index.html
src/storage/uploads/* /src/storage/uploads/*
!src/storage/uploads/index.html /!src/storage/uploads/index.html
vendor/ /vendor/

10
src/vendor/composer/autoload_static.php vendored
View file

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit27b185dd281c9a16e18aefb1c9e2d420 class ComposerStaticInit9c38908245762ba05608594a95bb6a4f
{ {
public static $prefixLengthsPsr4 = array ( public static $prefixLengthsPsr4 = array (
'p' => 'p' =>
@ -539,10 +539,10 @@ class ComposerStaticInit27b185dd281c9a16e18aefb1c9e2d420
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit27b185dd281c9a16e18aefb1c9e2d420::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit9c38908245762ba05608594a95bb6a4f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit27b185dd281c9a16e18aefb1c9e2d420::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit9c38908245762ba05608594a95bb6a4f::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit27b185dd281c9a16e18aefb1c9e2d420::$prefixesPsr0; $loader->prefixesPsr0 = ComposerStaticInit9c38908245762ba05608594a95bb6a4f::$prefixesPsr0;
$loader->classMap = ComposerStaticInit27b185dd281c9a16e18aefb1c9e2d420::$classMap; $loader->classMap = ComposerStaticInit9c38908245762ba05608594a95bb6a4f::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }