Commit Graph

10 Commits

Author SHA1 Message Date
Samuel Denis-D'Ortun aac195e893 Merge branch 'master' into develop 2016-05-18 23:14:56 -04:00
Samuel Denis-D'Ortun bceb6ea3db Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop
# Conflicts:
#	README.rst
#	docs/credits.rst
#	docs/intro.rst
#	src/includes/functions.inc.php
#	src/lang/de_DE.lang.php
#	src/lang/en_US.lang.php
#	src/lang/es_ES.lang.php
#	src/lang/fr_FR.lang.php
#	src/lang/it_IT.lang.php
#	src/lang/nl_NL.lang.php
#	src/lang/pl_PL.lang.php
#	src/lang/pt_BR.lang.php
#	src/lang/ru_RU.lang.php
#	src/lang/sv_SE.lang.php
#	src/lang/tr_TR.lang.php
#	src/lang/zh_CN.lang.php
2016-05-15 05:15:32 -04:00
Alexis U (portable) 57a01d27c5 add support for Octopush sms provider 2016-03-15 13:00:07 +01:00
Pepijn Over 52803e2d70 adding language subtags to template and support for right-to-left locales 2016-01-31 17:48:59 +01:00
Luis Rodriguez 6a2a4c1898 Implement Nexmo SMS Issue #170 2015-02-28 21:05:18 -05:00
Pepijn Over 51ff0f2044 updating copyright year in headers and email 2015-02-27 11:43:09 +01:00
Michiel van der Wulp 419ba4a0cf added freevoipdeal support 2014-12-11 13:16:06 +01:00
Pepijn Over 391701721b issue #128: adding SSL/TLS support forr SMTP 2014-11-06 14:30:39 +01:00
Pepijn Over a646928a70 updating changelog/credits for language changes 2014-11-06 10:53:43 +01:00
Haydar Kulekci 51ec51b9d5 turkish translation file 2014-10-24 11:24:54 +03:00