Commit Graph

4 Commits

Author SHA1 Message Date
Nicolas Grekas
3e923d0726 Merge branch '2.8'
* 2.8:
  remove wrong api tag that was introduced
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:21:06 +02:00
Nicolas Grekas
425eb8c5b7 [travis] Reduce composer.json merge conflicts on per-components tests 2015-10-23 18:38:57 +02:00
Nicolas Grekas
7742c30d55 [travis] Fix dev-master version for per deps tests 2015-07-22 16:32:18 +02:00
Nicolas Grekas
1c9b43396f [travis] Fix deps=high jobs 2015-07-21 19:12:21 +02:00