Skip to content

Commit

Permalink
Merge branch 'v2' of https://bitbucket.org/akveo/blur-admin into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
SashaSkywalker committed Mar 2, 2016
2 parents 11a0d47 + 28009f8 commit d30a4cd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ <h2>Features</h2>
<ul>
<li>Responsive layout</li>
<li>High resolution</li>
<li>Bootstrap 3.3.5 Framework</li>
<li>Bootstrap CSS Framework</li>
<li>Sass</li>
<li>Gulp build</li>
<li>AngularJS 1.4.6</li>
<li>Jquery 2.1.4</li>
<li>AngularJS</li>
<li>Jquery</li>
<li>Jquery ui</li>
<li>WHAT YOU GUYS CONSIDER SHOULD BE HERE? PAGES AND STUFF OR ONLY FEATURES MENTIONED ABOVE?</li>

Expand Down

0 comments on commit d30a4cd

Please sign in to comment.