diff options
| author | cedricnjanga | 2017-09-20 12:00:45 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-09-20 12:00:45 +0200 |
| commit | ce579b6fe5edb8f462de45a84ab7f4affe1b525a (patch) | |
| tree | f7f6827020695a61902077e06ce87d22f666ee12 /spec/support/with_commit.rb | |
| parent | d0703700f5b5e663739e9897c04c2136c953fa7e (diff) | |
| download | chouette-core-ce579b6fe5edb8f462de45a84ab7f4affe1b525a.tar.bz2 | |
Merge master to branch and resolve all the conflicts
We also needed to take remove the right time table dates when we update day types :
- excluded dates that are out of day types
- included dates that are in day types and in periods
Diffstat (limited to 'spec/support/with_commit.rb')
0 files changed, 0 insertions, 0 deletions