Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 0 insertions, 22 deletions

diff --git a/system/config/email.php b/system/config/email.php
deleted file mode 100644
index c768367c..00000000
--- a/system/config/email.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * SwiftMailer driver, used with the email helper.
- *
- * @see http://www.swiftmailer.org/wikidocs/v3/connections/nativemail
- * @see http://www.swiftmailer.org/wikidocs/v3/connections/sendmail
- * @see http://www.swiftmailer.org/wikidocs/v3/connections/smtp
- *
- * Valid drivers are: native, sendmail, smtp
- */
-$config['driver'] = 'native';
-
-/**
- * To use secure connections with SMTP, set "port" to 465 instead of 25.
- * To enable TLS, set "encryption" to "tls".
- *
- * Driver options:
- * @param   null    native: no options
- * @param   string  sendmail: executable path, with -bs or equivalent attached
- * @param   array   smtp: hostname, (username), (password), (port), (auth), (encryption)
- */
-$config['options'] = NULL;