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

Merge develop branch to hardfork branch #670

Merged
merged 32 commits into from
Feb 15, 2018
Merged

Merge develop branch to hardfork branch #670

merged 32 commits into from
Feb 15, 2018

Conversation

abitmore
Copy link
Member

No description provided.

oxarbitrage and others added 30 commits January 26, 2018 10:26
Fix error logging in push_proposal
* remove not needed checks

* delete

* change asserts

* readd delta_collateral assert

* fix spacing
Fix broken HTTP headers in elasticsearch requests
…tion

Resolution for issue #652 - Removed unused index by_feed_expiration
Add broadcast_transaction method for broadcasting transaction signed by …
Port plugin sanitization code from Steem to BitShares #468
…BTS_snapshot

remove temporary code for handling BTS snapshot
remove "temp for testing" code using BTS string literal
Copy link
Member

@oxarbitrage oxarbitrage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, please merge.

@abitmore abitmore merged commit 4a1f131 into hardfork Feb 15, 2018
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.

4 participants