# HG changeset patch
# User tzara <rc-web@kiben.net>
# Date 1345414991 0
# Node ID 5775286673c12d9be2aeb057d448b3743988cc09
# Parent  c4719d1b7633e1431217e5619464e727cf75a75e# Parent  710ce76d98fdfa8e869ec39f048040b8bcbbf09c
Merge branch 'master' of gitorious.org:nodescore/nodescore

Conflicts:
	www/m/thumbs/1.png
	www/m/thumbs/2.png
	www/m/thumbs/3.png
	www/m/thumbs/4.png
	www/m/thumbs/5.png
	www/m/thumbs/6.png

diff -r c4719d1b7633 -r 5775286673c1 nodescore
--- a/nodescore	Sun Aug 19 21:44:23 2012 +0000
+++ b/nodescore	Sun Aug 19 22:23:11 2012 +0000
@@ -9,7 +9,13 @@
 # nodescore@kiben.net
 # nodescore.kiben.net
 
+if [ "$1" = "home" ]
+then 
+SERVER='192.168.1.77:8889'
+else
 SERVER='http://nodescore.kiben.net:8889'
+fi
+
 BASEDIR='www/m'
 PROJECT='seta'
 THUMBPATH=$BASEDIR/thumbs