Commit Graph

6 Commits

Author SHA1 Message Date
Jacob Parker d0a579ab51 Merge branch 'master' of ../www.fuck
Conflicts:
	.gitignore
	src/config.d.sample
2012-02-24 16:35:34 -05:00
Jacob Parker b4af704877 Merge /users/jy2wong/www/rofl/dweb
Conflicts:
	.gitignore
	.htaccess
	pub/style/style.css
	src/web.d
2012-02-23 02:40:45 -05:00
Jennifer Yeelam Wong 355a123c93 Merge branch 'master' of https://github.com/j3parker/dweb
Conflicts:
	pub/style/style.css
2012-02-23 02:36:05 -05:00
Luqman Aden c71bd3a81d Added readme. .htaccess and config.d are also now ignored in git instead samples are provided to be copied over and modified. 2012-02-23 01:46:22 -05:00
Jacob Parker 852eca73df Got jy2wong's content, added folder handlers, started some dynamic member page content stuff 2012-02-22 19:17:10 -05:00
Jacob Parker c3c1116e5f dweb v0.1 2012-02-19 10:33:49 -05:00