alext
|
7b682e5c16
|
Updated gulp composer task and files.
|
2017-06-11 21:52:13 +02:00 |
|
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 |
|
alext
|
6e4d333f71
|
Updated PHPMailer in vendor directory.
|
2017-05-18 22:10:16 +02:00 |
|
alext
|
69586b5207
|
Added new composer file.
|
2016-12-07 19:45:47 +01:00 |
|
alext
|
2e2cb09a2d
|
Renamed "composer" directory to "composer_modules" and updated its references.
|
2016-11-13 12:46:02 +01:00 |
|
Alex Tselegidis
|
7280a5d0c2
|
Moved third_party directory to vendor which will be used for loading the composer dependencies.
|
2016-07-11 23:13:24 +02:00 |
|