Pārlūkot izejas kodu

Merge branch '4.0.4-wip' of github.com:FortAwesome/Font-Awesome into 4.0.4-wip

* '4.0.4-wip' of github.com:FortAwesome/Font-Awesome:
  hand-deleted changes
  Update README.md
  ensure PR on the dev branch
  referenced .min.css file for CDN
Geremia Taglialatela 11 gadi atpakaļ
vecāks
revīzija
849af133ab
2 mainītis faili ar 7 papildinājumiem un 2 dzēšanām
  1. 6 1
      README.md
  2. 1 1
      src/get-started.html

+ 6 - 1
README.md

@@ -1,4 +1,4 @@
-#[Font Awesome v4.0.3](http://fontawesome.io)
+#[Font Awesome v4.0.4](http://fontawesome.io)
 ###the iconic font designed for Bootstrap
 ###the iconic font designed for Bootstrap
 
 
 Font Awesome is a full suite of 369 pictographic icons for easy scalable vector graphics on websites, created and
 Font Awesome is a full suite of 369 pictographic icons for easy scalable vector graphics on websites, created and
@@ -29,6 +29,11 @@ Get started at http://fontawesome.io!
 - [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
 - [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
 - [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed)
 - [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed)
 - [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed)
 - [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed)
+- [v4.0.4 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=10&page=1&state=closed)
+
+## Contributing
+
+Please read through our [contributing guidelines](https://github.com/FortAwesome/Font-Awesome/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
 
 
 ##Versioning
 ##Versioning
 
 

+ 1 - 1
src/get-started.html

@@ -27,7 +27,7 @@ relative_path: ../
       <li>
       <li>
         Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML.
         Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML.
 {% highlight html %}
 {% highlight html %}
-<link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version }}/css/font-awesome.css" rel="stylesheet">
+<link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version }}/css/font-awesome.min.css" rel="stylesheet">
 {% endhighlight %}
 {% endhighlight %}
         <p class="alert alert-success"><i class="fa fa-info-circle"></i> Immediately after release, it takes a bit of time for BootstrapCDN to catch up and get the newest version live on their CDN.</p>
         <p class="alert alert-success"><i class="fa fa-info-circle"></i> Immediately after release, it takes a bit of time for BootstrapCDN to catch up and get the newest version live on their CDN.</p>
       </li>
       </li>