Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Conflicts:
	README.md
  • Loading branch information...
commit 5660f4dc9f118688e22ec97004cb812430aac39c 2 parents c8851a4 + 59f3d23
@Nerian authored
Showing with 4 additions and 6 deletions.
  1. +4 −6 README.md
View
10 README.md
@@ -1,11 +1,10 @@
-# Bootstrap Wysihtml5 for Rails
+# Bootstrap wysihtml5 for Rails
[![Gem Version](https://badge.fury.io/rb/bootstrap-wysihtml5-rails.png)](http://badge.fury.io/rb/bootstrap-wysihtml5-rails)
[![endorse](https://api.coderwall.com/nerian/endorsecount.png)](https://coderwall.com/nerian)
-Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
-It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
+[Bootstrap](http://getbootstrap.com) is a toolkit from Twitter designed to kickstart development of webapps and sites. It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
http://twitter.github.com/bootstrap/
@@ -31,8 +30,7 @@ or you can install from latest build;
``` ruby
gem 'bootstrap-wysihtml5-rails', :git => 'git://github.com/Nerian/bootstrap-wysihtml5-rails.git'
```
-
-and run bundle install.
+and run `bundle install`.
This gem doesn't include Bootstrap. You can get Bootstrap here: https://github.com/twbs/bootstrap-sass
@@ -89,7 +87,7 @@ $(document).on('page:load', function(){
```
## License
-Copyright (c) 2012-2013 Gonzalo Rodríguez-Baltanás Díaz
+Copyright (c) 2012-2014 Gonzalo Rodríguez-Baltanás Díaz
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Please sign in to comment.
Something went wrong with that request. Please try again.