aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure
diff options
context:
space:
mode:
authorMichael Prasuhn <mike@mikeyp.net>2010-04-16 01:30:01 -0700
committerMichael Prasuhn <mike@mikeyp.net>2010-04-16 01:30:01 -0700
commit009b92e3425f9d0fa764e02a191bd139b4f8ae1c (patch)
tree0e40ab12a8ecaeb31c38711aab0ddf4d3dcf0d3d /infrastructure
parent7530d58f61101db91e03ba075a47299db1f96f35 (diff)
parentcd2bbd0e602244403ca379f9f4d9d15bbde545a7 (diff)
downloadetherpad-009b92e3425f9d0fa764e02a191bd139b4f8ae1c.tar.gz
etherpad-009b92e3425f9d0fa764e02a191bd139b4f8ae1c.tar.xz
etherpad-009b92e3425f9d0fa764e02a191bd139b4f8ae1c.zip
Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'
Diffstat (limited to 'infrastructure')
-rw-r--r--infrastructure/com.etherpad/licensing.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/infrastructure/com.etherpad/licensing.scala b/infrastructure/com.etherpad/licensing.scala
index 9318f78..68019f5 100644
--- a/infrastructure/com.etherpad/licensing.scala
+++ b/infrastructure/com.etherpad/licensing.scala
@@ -134,7 +134,7 @@ object Licensing {
println("Done.");
}
case "genmainkey" => {
- println("Generating key for etherpad.com...");
+ println("Generating main key...");
config.values("licenseGeneratorKey") = args(1);
val out = new PrintWriter(new FileOutputStream(args(2)));
out.print(generateKey("etherpad", "AppJet", -1, 0, -1, 0, 0, 0))