Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ForkAwesome/Fork-Awesome.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Gandy <dave@davegandy.com>2016-10-24 18:42:21 +0300
committerDave Gandy <dave@davegandy.com>2016-10-24 18:42:21 +0300
commit9fe5852ce8e9a3ccc12465da41dac13901abf381 (patch)
tree280d716599ecea1772b2ccfa7e11e5cdcff83db6
parent12c3110e4d8068ed80a499610d751366033dd8f9 (diff)
parent69fa1b735e97ad1c4412da7fbb9b19975308e98c (diff)
Merge branch 'master' into 4.7.0
-rw-r--r--src/_includes/examples/bordered-pulled.html4
-rw-r--r--src/whats-new.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/_includes/examples/bordered-pulled.html b/src/_includes/examples/bordered-pulled.html
index 33f9922ed..b7841f0c2 100644
--- a/src/_includes/examples/bordered-pulled.html
+++ b/src/_includes/examples/bordered-pulled.html
@@ -10,7 +10,7 @@
<div class="col-md-3 col-sm-4">
<p>
<i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
- &hellip;tomorrow we will run faster, stretch out our arms farther&hellip; And then one fine morning—
+ &hellip;tomorrow we will run faster, stretch out our arms farther&hellip; And then one fine morning&mdash;
So we beat on, boats against the current, borne back ceaselessly into the past.
</p>
</div>
@@ -22,7 +22,7 @@
{% highlight html %}
<i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
...tomorrow we will run faster, stretch out our arms farther...
-And then one fine morning— So we beat on, boats against the
+And then one fine morning&mdash; So we beat on, boats against the
current, borne back ceaselessly into the past.
{% endhighlight %}
</div>
diff --git a/src/whats-new.html b/src/whats-new.html
index 309eca36b..fd3a3cf63 100644
--- a/src/whats-new.html
+++ b/src/whats-new.html
@@ -23,7 +23,7 @@ relative_path: ../
<div class="row feature-list">
<div class="col-md-4 col-sm-6">
<h4><i class="fa fa-universal-access" aria-hidden="true"></i> <a href="{{ page.relative_path }}accessibility">Accessibility Docs</a></h4>
- Details on how to mark up your icons depending on how you’re using them.
+ Details on how to mark up your icons depending on how you're using them.
Make your site icons usable by the most people, and start here.
</div>
<div class="col-md-4 col-sm-6">