Skip to content

Develop #98

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 7 commits into from
Sep 12, 2015
Merged

Develop #98

merged 7 commits into from
Sep 12, 2015

Conversation

acostarelli
Copy link
Contributor

updating deploy-script

Francis Veilleux-Gaboury added 7 commits August 30, 2015 11:05
Added mythos/hindu/ images
75746d0
Merge branch 'card-images' of https://github.com/Cardshifter/HTML-Client
a0c5377 
 into card-images

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge remote-tracking branch 'origin/card-images' into card-images
65478a5
Add mythos/greek image files
91b0a58
Cropped bear.jpg correctly
60646a6
images/cards/mythos/common
4998a8d
merge card-images into develop
3664d72
acostarelli pushed a commit that referenced this pull request Sep 12, 2015
@sirpython
Merge pull request #98 from Cardshifter/develop
1355128 
Develop
@acostarelli acostarelli merged commit 1355128 into deploy-script Sep 12, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@acostarelli