Merge branch 'master' into patch-1
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- Gemfile 1 addition, 0 deletionsGemfile
- _data/downloads.yml 10 additions, 1 deletion_data/downloads.yml
- _data/irc.yml 22 additions, 0 deletions_data/irc.yml
- _data/merchants.yml 4 additions, 2 deletions_data/merchants.yml
- _includes/footer.html 2 additions, 2 deletions_includes/footer.html
- _includes/header.html 2 additions, 0 deletions_includes/header.html
- _layouts/post.html 4 additions, 2 deletions_layouts/post.html
- _posts/2016-03-05-overview-and-logs-for-the-dev-meeting-held-on-2016-03-05.md 29 additions, 0 deletions...erview-and-logs-for-the-dev-meeting-held-on-2016-03-05.md
- _posts/2017-08-20-logs-for-the-Kovri-dev-meeting-held-on-2017-08-20.md 172 additions, 0 deletions...8-20-logs-for-the-Kovri-dev-meeting-held-on-2017-08-20.md
- _posts/2017-08-20-overview-and-logs-for-the-dev-meeting-held-on-2017-08-20.md 502 additions, 0 deletions...erview-and-logs-for-the-dev-meeting-held-on-2017-08-20.md
- _posts/2017-09-02-logs-for-the-Community-meeting-held-on-2017-09-02.md 245 additions, 0 deletions...9-02-logs-for-the-Community-meeting-held-on-2017-09-02.md
- _posts/2017-09-03-overview-and-logs-for-the-dev-meeting-held-on-2017-09-03.md 212 additions, 0 deletions...erview-and-logs-for-the-dev-meeting-held-on-2017-09-03.md
- _posts/2017-09-07-monero-0.11.0.0-released.md 116 additions, 0 deletions_posts/2017-09-07-monero-0.11.0.0-released.md
- _strings_en.yml 1 addition, 0 deletions_strings_en.yml
- community/hangouts/index.md 6 additions, 33 deletionscommunity/hangouts/index.md
- css/custom.css 6 additions, 5 deletionscss/custom.css
- downloads/hashes.txt 15 additions, 17 deletionsdownloads/hashes.txt
- downloads/index.md 1 addition, 1 deletiondownloads/index.md
- get-started/faq/index.md 14 additions, 0 deletionsget-started/faq/index.md
... | ... | @@ -4,3 +4,4 @@ gem 'jekyll' |
gem 'jekyll-paginate' | ||
gem 'builder' | ||
gem 'rubysl-rexml' | ||
gem 'wdm', '>= 0.1.0' if Gem.win_platform? |
_data/irc.yml
0 → 100644
Please register or sign in to comment