alext b568061ffd Merge branch 'master' into develop ... # Conflicts: # .gitignore # CHANGELOG.md # composer.lock # doc/faq.md # gulpfile.js # src/vendor/autoload.php # src/vendor/composer/autoload_real.php # src/vendor/composer/installed.json # src/vendor/phpmailer/phpmailer/VERSION # src/vendor/phpmailer/phpmailer/class.phpmailer.php # src/vendor/phpmailer/phpmailer/class.pop3.php # src/vendor/phpmailer/phpmailer/class.smtp.php		2017-05-24 23:31:47 +02:00
..
composer	Merge branch 'master' into develop	2017-05-24 23:31:47 +02:00
gregwar/captcha	Moved third_party directory to vendor which will be used for loading the composer dependencies.	2016-07-11 23:13:24 +02:00
phpmailer/phpmailer	Updated PHPMailer in vendor directory.	2017-05-18 22:10:16 +02:00
autoload.php	Updated PHPMailer in vendor directory.	2017-05-18 22:10:16 +02:00
index.html	Moved third_party directory to vendor which will be used for loading the composer dependencies.	2016-07-11 23:13:24 +02:00