Merge branch 'client-redesign'

Conflicts:
	yaws.dev.conf
This commit is contained in:
Jonathan Bernard
2011-06-07 08:38:09 -05:00
74 changed files with 5126 additions and 2511 deletions

View File

@@ -3,7 +3,7 @@ ebin_dir = /home/jdbernard/projects/jdb-labs/timestamper/web-app/ebin
runmod = timestamper_dev
<server timestamper.jdb-labs-local>
<server timestamper-local>
port = 8000
listen = 127.0.0.1
docroot = /home/jdbernard/projects/jdb-labs/timestamper/web-app/www