This repository was archived by the owner on Feb 22, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 148
Master merge conflicts #1532
Merged
oskar-binary
merged 63 commits into
binary-com:development
from
oskar-binary:master_merge_conflicts
Jun 4, 2020
Merged
Master merge conflicts #1532
oskar-binary
merged 63 commits into
binary-com:development
from
oskar-binary:master_merge_conflicts
Jun 4, 2020
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…pment Revert "V20191104_0"
…-1500-development Revert "Revert "V20191104_0""
* move build to circleci * fix circleci config * change base image to node * try node 12.13.0 image * try circleci node image * update build command * update docker image name * rm travi
shudarshon.chaks/enabled artifact and artifact checksum upload steps in circleci
mahdi/add_cleanup_exception See merge request binary/webtrader!1521
…t_tag_to_docker_image Add docker image to release with latest tag
mahdi/revert_gitlab
Co-authored-by: Mahboobeh <mahboobeh@Mahboobehs-MacBook-Pro.local>
behnaz/oneHashtak-added
mustofa-binary
approved these changes
Jun 4, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.