Permalink
Browse files

Merge branch 'develop' of github.com:localprojects/Change-By-Us into …

…develop
  • Loading branch information...
2 parents a7a820f + 3233168 commit 09e1976b5c0414f4191140283df97e083145a3fb @cybertoast cybertoast committed Apr 20, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −1 etc/config.yaml.tmpl
  2. +2 −1 rcfile.sample
View
2 etc/config.yaml.tmpl
@@ -56,7 +56,7 @@ log_archive_path: %(log_archive_path)s
#--------------------------------------------------------------------
default_host: %(default_host)s
blog_host: %(blog_host)s
-blog_host_feed: %(blog_host)s
+blog_host_feed: %(blog_host_feed)s
# Site settings
View
3 rcfile.sample
@@ -101,7 +101,8 @@ instance = ChangeByUs-dev
htaccess = No
default_host = http://localhost:8080/
-blog_host = http://dev-nycblog.changeby.us/
+blog_host = http://blog.changeby.us/
+blog_host_feed = http://blog.changeby.us/?feed=cbujson
# Database stuff
database_db = gam2

0 comments on commit 09e1976

Please sign in to comment.