Skip to content

Centralize repository#20

Open
curtislacy wants to merge 5 commits intograzcoin:masterfrom
curtislacy:Centralize-Repository
Open

Centralize repository#20
curtislacy wants to merge 5 commits intograzcoin:masterfrom
curtislacy:Centralize-Repository

Conversation

@curtislacy
Copy link

Merge in the changes that I understand have been accepted from mastercoin-MSC#3, to begin the normalization process.

grazcoin and others added 5 commits March 2, 2014 11:15
keep json branch without user-interface on top of DEx code base
default on globals is '~/mastercoin-tools'
the cron script can be also updated by setting MASTERCOIN_TOOLS_DIR
automatic html generator
…nto Centralize-Repository

Conflicts:
	html_includes/body_address.inc
	html_includes/body_btcpayment.inc
	html_includes/body_recent.inc
	html_includes/body_sellaccept.inc
	html_includes/body_selloffer.inc
	html_includes/body_simplesend.inc
	html_includes/head_begin.inc
	www/404.html
	www/API.html
	www/About.html
	www/Address.html
	www/License.html
	www/acceptform.html
	www/btcpayment.html
	www/exodus.html
	www/index.html
	www/javascript_required.html
	www/professional.html
	www/sellaccept.html
	www/sellform.html
	www/selloffer.html
	www/sendform.html
	www/simplesend.html
	www/wallet.html
maddenpj pushed a commit to maddenpj/mastercoin-tools that referenced this pull request Mar 26, 2014
Merge in two post-dex-launch fixes from grazcoin's repo
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.

3 participants

Comments