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 master into develop branch #13

Merged
merged 4 commits into from Jan 3, 2020
Merged

merge master into develop branch #13

merged 4 commits into from Jan 3, 2020

Conversation

jrosco
Copy link
Owner

@jrosco jrosco commented Jan 3, 2020

Company Name: {}

Node URI: {}

Twitter: {}

* fixed pr template url

* moved example file and added travel category
* fixed pr template url

* moved example file and added travel category

* added travelbybit store
* fixed pr template url

* moved example file and added travel category

* added travelbybit store

* fixed
@jrosco jrosco merged commit f570143 into develop Jan 3, 2020
jrosco added a commit that referenced this pull request Apr 24, 2021
* fixed css/js file

* renamed summary

updated README

updated config.yml

* Create CNAME

* Delete CNAME

* Create CNAME

* Delete CNAME

* fixed path

* development work - adding show if merchant supports bitcoin

* added example.yml

cleanup betting.yml, cryptocurrencies.yml, and 4 more files...

* moved CONTRIBUTING to .github

* cleanup

* updated issue link

* cleaned html code and added new size images

* updated example site details

* Update example.yml

* enabled sections (#5)

* Add ln pizza store (#6)

* added ln pizza store (food)

* cleanup a few things

* converted Yes/No to true/false (#7)

* Add ln pizza store2 (#8)

* converted Yes/No to true/false

* added ln pizza image

* merge master into develop branch (#13)

* fixed pr template url (#9)

* Fixed pr template url (#10)

* fixed pr template url

* moved example file and added travel category

* Add travelbybit store (#11)

* fixed pr template url

* moved example file and added travel category

* added travelbybit store

* Add travelbybit store (#12)

* fixed pr template url

* moved example file and added travel category

* added travelbybit store

* fixed

* Add travelbybit store (#14)

* fixed pr template url

* moved example file and added travel category

* added travelbybit store

* fixed

* fixed duplicates

* fixed duplicates

* fixed travelbybit logo

* style changes (#15)

primary color is now #fcac00
search bar set to 40% coverage

* NEW STORE - Joltfun store added

updated ln pizza details

updated gaming details

NEW STORE - Bitrefill

updated travelbybit

renamed altcoins text

Added example store entry

added imgs

* comment out unused categories

homepage icon links to home page

* fixed url in configuration file

* updated LN pizza

Updated gaming section

NEW_STORE Bitclouds VPS

Updated sections

NEW_STORE TorGuard

General updates

* PR template relocation

* create a issue template

* Updated gaming keyword search
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.

None yet

1 participant