Merge branch 'master' of git://github.com/bsag/tracks

Conflicts:

	config/routes.rb
This commit is contained in:
Reinier Balt 2008-06-18 10:13:56 +02:00
commit 952a73e39d
1092 changed files with 52802 additions and 20798 deletions

2
.gitignore vendored
View file

@ -1,3 +1,4 @@
*.tmproj
config/database.yml
config/environment.rb
log
@ -5,3 +6,4 @@ tmp
db/data.yml
db/*.sqlite3
nbproject
vendor/plugins/query_trace/