Merge branch 'master' of git.luon.net:anne-survey

2011-02-15 18:27:36 +01:00 · 2010-06-21 16:01:55 +02:00 · 2011-02-14 20:51:39 +01:00 · 2010-06-21 19:38:37 +02:00 · 2011-02-15 18:27:30 +01:00 · 2010-05-31 19:02:04 +02:00
diff --git a/Paul van Tilburg b/Paul van Tilburg
Paul van Tilburg 942788be2e Merge branch 'master' of git.luon.net:anne-survey		2011-02-15 18:27:36 +01:00
public/images	Added Philips logo and mentioned Living Colors lamp.	2010-06-21 16:01:55 +02:00
.gitignore	Added a suitable .gitignore.	2011-02-14 20:51:39 +01:00
anne-survey.rb	Get rid of the stupid constant redefine warnings.	2010-06-21 19:38:37 +02:00
config.ru	Use the correct module namespace and also create/migrate the DB when needed.	2011-02-15 18:27:30 +01:00
resize-images.sh	Use different image size, crop the borders.	2010-05-31 19:02:04 +02:00