Commit Graph

10 Commits

Author SHA1 Message Date
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
Luis Rodriguez 6a2a4c1898 Implement Nexmo SMS Issue #170 2015-02-28 21:05:18 -05:00
Michiel van der Wulp 419ba4a0cf added freevoipdeal support 2014-12-11 13:16:06 +01:00
Pepijn Over 8f08c946be docs update for pushover and new languages 2014-07-31 16:30:02 +02:00
Pepijn Over c10d714a7d importing danish language, updating redirect for login and docs updates 2014-04-25 07:42:53 +02:00
Pepijn Over 9c56b73db9 adding download link to docs 2014-04-18 17:43:15 +02:00
Pepijn Over 5f31d06808 intro indent wrong 2014-04-10 20:11:43 +02:00
Pepijn Over 72507a7d94 removing docs indentation (markdown > resT..) 2014-04-10 20:08:46 +02:00
Pepijn Over 52923336f3 changing markdown to rst; updating docs; adding docs build dir to gitignore; adding docs to release export 2014-04-10 19:57:36 +02:00
Pepijn Over f1139abf13 trying out rst files dor readthedocs.org 2014-04-09 23:55:15 +02:00