summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML
diff options
context:
space:
mode:
authorJaime Perez Crespo <jaime.perez@uninett.no>2015-12-24 15:56:28 +0100
committerJaime Perez Crespo <jaime.perez@uninett.no>2015-12-24 15:56:28 +0100
commitbb2da57d4020f283f0dea5545e9dd51856afc191 (patch)
tree854fcdf5a7e82f57fa2ef1a7d2941d1b955b0c84 /lib/SimpleSAML
parent4fafd739fc2819943de1baeda4545e225a9559ac (diff)
downloadsimplesamlphp-bb2da57d4020f283f0dea5545e9dd51856afc191.zip
simplesamlphp-bb2da57d4020f283f0dea5545e9dd51856afc191.tar.gz
simplesamlphp-bb2da57d4020f283f0dea5545e9dd51856afc191.tar.bz2
Rename the development version from "trunk" to "master".
Diffstat (limited to 'lib/SimpleSAML')
-rw-r--r--lib/SimpleSAML/Configuration.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 64512ef..4c0b878 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -323,7 +323,7 @@ class SimpleSAML_Configuration
*/
public function getVersion()
{
- return 'trunk';
+ return 'master';
}