Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New sample workspace #140

Merged
merged 21 commits into from
Mar 27, 2017
Merged

Conversation

abovedave
Copy link
Contributor

Closes #133

@abovedave abovedave requested a review from jimlambie March 27, 2017 12:38
@abovedave abovedave changed the base branch from master to feature/version-2.0 March 27, 2017 12:39
David Longworth added 9 commits March 27, 2017 13:41
…o feature/new-sample-workspace

# Conflicts:
#	workspace/data-sources/articles.json
#	workspace/data-sources/books.json
#	workspace/data-sources/car-makes.json
#	workspace/data-sources/car-models.json
#	workspace/debug/assets/css/pretty-json.css
#	workspace/debug/assets/js/main.js
#	workspace/debug/assets/js/pretty-json-min.js
#	workspace/debug/partials/debug-panel.dust
#	workspace/events/test.js
#	workspace/pages/500.dust
#	workspace/pages/500.json
#	workspace/pages/articles.dust
#	workspace/pages/articles.json
#	workspace/pages/book.dust
#	workspace/pages/book.json
#	workspace/pages/books.dust
#	workspace/pages/books.json
#	workspace/pages/books_by_author.dust
#	workspace/pages/books_by_author.json
#	workspace/pages/car-reviews.dust
#	workspace/pages/car-reviews.json
#	workspace/pages/cars.dust
#	workspace/pages/category.dust
#	workspace/pages/category.json
#	workspace/pages/index.dust
#	workspace/pages/layout.dust
#	workspace/pages/makes.json
#	workspace/partials/footer.dust
#	workspace/routes/constraints.js
#	workspace/routes/rewrites.json
@abovedave abovedave changed the title Feature/new sample workspace New sample workspace Mar 27, 2017
@jimlambie jimlambie merged commit dce7637 into feature/version-2.0 Mar 27, 2017
@jimlambie jimlambie deleted the feature/new-sample-workspace branch March 27, 2017 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants