Merge branch 'develop' into feature/login-redirect

Conflicts: src/foreclojure/login.clj
4clojure · Apr 22, 2011 · 077c36f · 077c36f
2 parents 9a9f73c + 6aed4cd
commit 077c36f
Show file tree

Hide file tree

Showing 36 changed files with 883 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ pom.xml
 *~
 *#
 .cake
+.DS_Store
diff --git a/config.clj b/config.clj
@@ -0,0 +1,4 @@
+{:wrap-reload false
+ :db-host "localhost"
+ :db-user nil
+ :db-pwd nil}
diff --git a/keystore b/keystore
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.0.2"
+(defproject foreclojure "0.0.3"
   :description "4clojure - a website for lisp beginners"
   :dependencies [[org.clojure/clojure "1.2.1"]
                  [org.clojure/clojure-contrib "1.2.0"]
@@ -10,7 +10,8 @@
 		 [org.jasypt/jasypt "1.7"]
                  [amalloy/utils "[0.3.7,)"]
                  [clj-github "1.0.0-SNAPSHOT"]
-                 [ring "0.3.7"]]
+                 [ring "0.3.7"]
+                 [clj-config "0.1.0"]]
   :dev-dependencies [[lein-ring "0.4.0"]
                      [swank-clojure "1.2.1"]]
   :main foreclojure.core