diff options
| author | Sem <sembrestels@riseup.net> | 2012-04-26 23:57:14 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-04-26 23:57:14 +0200 |
| commit | 848038cef6f28cd3e3744825ff806709009325fe (patch) | |
| tree | 60bf44debd7cd8d708a25cb44e7e311e800258d5 | |
| parent | 9fe063022e08a4b6fa5f5935f8f185d5d95814a4 (diff) | |
| parent | 72f0c8462e79333667ebddd885500e5efddd1c28 (diff) | |
| download | elgg-848038cef6f28cd3e3744825ff806709009325fe.tar.gz elgg-848038cef6f28cd3e3744825ff806709009325fe.tar.bz2 | |
Merge branch '1.8' of git://github.com/Elgg/Elgg
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | views/default/core/walled_garden/body.php | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..5cc8f375a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: php
+phps:
+ - 5.2
+ - 5.3
+
+script: phpunit --help
+
+branches:
+ only:
+ - master
\ No newline at end of file diff --git a/views/default/core/walled_garden/body.php b/views/default/core/walled_garden/body.php deleted file mode 100644 index 67d8e0c37..000000000 --- a/views/default/core/walled_garden/body.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Walled garden body - */ - -echo elgg_view('core/walled_garden/login'); -echo elgg_view('core/walled_garden/lost_password'); - -if (elgg_get_config('allow_registration')) { - echo elgg_view('core/walled_garden/register'); -} |