From 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 04:52:02 -0400
Subject: [PATCH] - Merge devel-framework branch, resolved conflicts
---
program/include/clisetup.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/include/clisetup.php b/program/include/clisetup.php
index c5f8dd1..22ffbbc 100644
--- a/program/include/clisetup.php
+++ b/program/include/clisetup.php
@@ -55,7 +55,7 @@
continue;
$args[$key] = preg_replace(array('/^["\']/', '/["\']$/'), '', $value);
-
+
if ($alias = $aliases[$key])
$args[$alias] = $args[$key];
}
--
Gitblit v1.9.1