mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-21 21:40:48 +02:00
Merge branch 'master' of git://github.com/bsag/tracks
Conflicts: config/routes.rb
This commit is contained in:
commit
952a73e39d
1092 changed files with 52802 additions and 20798 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -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/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue