E812 Merge branch 'wip-3.0' · csseditor/bootstrap-magic@a4444a2 · GitHub
Skip to content

Commit a4444a2

Browse files
pikockpikock
committed
Merge branch 'wip-3.0'
2 parents 4fa9188 + d4e8510 commit a4444a2

410 files changed

Lines changed: 110988 additions & 16067 deletions

File tree

Some content is hidden

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

‎2.3.2/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## Master

‎2.3.2/LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License
2+
3+
Copyright (c) 2012 the Autre planete and Pikock Team, http://www.autreplanete.com, http://www.pikock.com,
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎2.3.2/README.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Bootstrap magic
2+
==============
3+
4+
Bootstrap themes generator made with AngularJS
5+
6+
[Try it out!](http://pikock.github.com/bootstrap-magic/)
7+
8+
9+
#### Build on Angular-seed
10+
11+
For more information about [Angular-seed](https://github.com/angular/angular-seed/) Angular-seed please check out https://github.com/angular/angular-seed/
12+
13+
14+
## Contact
15+
16+
For more information on [Pikock](http://www.pikock.com/) please check out http://www.pikock.com/
17+
For more information on [Autre planete](http://www.autreplanete.com/) please check out http://www.autreplanete.com/
18+
For more information on [AngularJS](http://angularjs.org/) please check out http://angularjs.org/
19+
For more information on [Twitter Bootstrap](http://twitter.github.com/bootstrap/) please check out http://twitter.github.com/bootstrap/
20+
21+

‎2.3.2/app/css/.gitignore‎

Whitespace-only changes.

0 commit comments

Comments
 (0)