Skip to content

Commit feb8283

Browse files
committed
Merge branch 'dev' into pdev09062016
# Conflicts: # _includes/white-footer.html # _layouts/blogs.html # products-and-docs/apis/discovery/v2/index.md # products-and-docs/apis/getting-started/index.md # support/index.md
2 parents 4a92cde + 9401ef7 commit feb8283

129 files changed

Lines changed: 16744 additions & 3184 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ author :
2828
production_url : http://developers.ticketmaster.com/
2929
gems:
3030
- jekyll-redirect-from
31+

_data/fruits.yml

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)