Skip to content

Commit b533199

Browse files
authored
Merge pull request #2041 from 18F/dev
Dev --> master
2 parents fc05886 + 9e4a565 commit b533199

File tree

236 files changed

+757
-1336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+757
-1336
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ group :jekyll_plugins do
99
if ENV['FAST_BUILDS'] == 'true'
1010
puts 'not using jekyll-archives because its sloooooooooow'
1111
else
12-
gem 'jekyll-archives', :git => 'https://github.com/jekyll/jekyll-archives.git'
12+
gem 'jekyll-archives', :git => 'https://github.com/18F/jekyll-archives.git'
1313
end
1414

1515
gem 'jekyll_pages_api'

Gemfile.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
GIT
2+
remote: https://github.com/18F/jekyll-archives.git
3+
revision: 9ad78a4aa38de0af570a53f3c12558408e9537f7
4+
specs:
5+
jekyll-archives (2.1.0)
6+
jekyll (>= 2.4)
7+
18
GEM
29
remote: https://rubygems.org/
310
specs:
@@ -108,6 +115,7 @@ PLATFORMS
108115
DEPENDENCIES
109116
html-proofer
110117
jekyll (~> 3.1)
118+
jekyll-archives!
111119
jekyll-feed
112120
jekyll-paginate
113121
jekyll-redirect-from

_authors/18F.md

Lines changed: 13 additions & 0 deletions

_authors/aaron.md

Lines changed: 3 additions & 3 deletions

_authors/ada-lovelace.md

Lines changed: 1 addition & 1 deletion

_authors/adam-kendall.md

Lines changed: 1 addition & 1 deletion

_authors/adrian-webb.md

Lines changed: 1 addition & 1 deletion

_authors/afeld.md

Lines changed: 1 addition & 1 deletion

_authors/alan-atlas.md

Lines changed: 1 addition & 1 deletion

_authors/alan-brouilette.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)