Permalink
Browse files

Merge branch 'master' of github.com:alphagov/frontend

  • Loading branch information...
robyoung committed Apr 16, 2012
2 parents b20c6d1 + d5ae181 commit bd481c0d5e05748bade82d062fe76edbf8168a2e
Showing with 5 additions and 8 deletions.
  1. +5 −4 Gemfile.lock
  2. +0 −4 app/views/root/index.html.erb
View
@@ -95,7 +95,7 @@ GEM
hike (1.2.1)
htmlentities (4.3.1)
i18n (0.6.0)
- json (1.6.5)
+ json (1.6.6)
kramdown (0.13.4)
launchy (2.0.5)
addressable (~> 2.2.6)
@@ -112,7 +112,7 @@ GEM
metaclass (~> 0.0.1)
multi_json (1.0.4)
mustache (0.99.4)
- nokogiri (1.5.0)
+ nokogiri (1.5.2)
null_logger (0.0.1)
plek (0.1.20)
builder
@@ -171,12 +171,13 @@ GEM
simplecov-html (0.5.3)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slimmer (1.1.33)
+ slimmer (1.1.39)
+ gds-api-adapters (~> 0.0.33)
json
nokogiri (~> 1.5.0)
null_logger
plek (>= 0.1.8)
- rack (~> 1.3.5)
+ rack (>= 1.3.5)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -23,10 +23,6 @@ services and information" %>
<div class="feature-items">
<div class="sections">
<div class="section">
- <div class="news">
- <h2><a href="/government"><span>New</span> Inside Government</a></h2>
- <p><a href="/government">Find out how government works, see what it&rsquo;s doing and get&nbsp;involved</a></p>
- </div>
<div class="browse">
<h2>Browse</h2>
<ul>

0 comments on commit bd481c0

Please sign in to comment.