-
Notifications
You must be signed in to change notification settings - Fork 450
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into starter-kit
# Conflicts: # #jekyll-theme-hydejack # Gemfile.lock # _data/authors.yml # _includes/my-head.html # docs/print.md # offline.md
- Loading branch information
Showing
10 changed files
with
26 additions
and
162 deletions.
There are no files selected for viewing
Submodule #jekyll-theme-hydejack
updated
63 files
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -344,7 +344,7 @@ author: | |
social: | ||
email: [email protected] | ||
rss: {{ site.url }}{{ site.baseurl }}/feed.xml # make sure you provide an absolute URL | ||
download: https://github.com/hydecorp/hydejack/archive/v9.1.5.zip | ||
download: https://github.com/hydecorp/hydejack/archive/v9.1.6.zip | ||
~~~ | ||
|
||
|
||
|
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,7 @@ You can now also [![Deploy to Netlify][dtn]][nfy]{:.no-mark-external} directly. | |
{:.note} | ||
|
||
[hsc]: https://github.com/hydecorp/hydejack-starter-kit | ||
[src]: https://github.com/hydecorp/hydejack-starter-kit/archive/v9.1.5.zip | ||
[src]: https://github.com/hydecorp/hydejack-starter-kit/archive/v9.1.6.zip | ||
[nfy]: https://app.netlify.com/start/deploy?repository=https://github.com/hydecorp/hydejack-starter-kit | ||
[dtn]: https://www.netlify.com/img/deploy/button.svg | ||
|
||
|
@@ -93,7 +93,7 @@ For existing sites, you can instead set the `remote_theme` key as follows: | |
|
||
```yml | ||
# file: `_config.yml` | ||
remote_theme: hydecorp/[email protected].5 | ||
remote_theme: hydecorp/[email protected].6 | ||
``` | ||
Make sure the `plugins` list contains `jekyll-include-cache` (create if it doesn't exist): | ||
|
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,7 @@ and you have to apply them again. Make sure you've made a backup before overwrit | |
When building on GitHub Pages, upgrading Hydejack is as simple as setting the `remote_theme` key in `_config.yml` to the desired version. | ||
|
||
```yml | ||
remote_theme: hydecorp/[email protected].5 | ||
remote_theme: hydecorp/[email protected].6 | ||
``` | ||
To use the latest version on the `v9` branch on each build, you can use `hydecorp/hydejack@v9`. | ||
|
This file contains 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
This file was deleted.
Oops, something went wrong.