davegandy 495649eaea merge conficts

2013-09-30 18:22:41 -04:00

..

_bootstrap.scss

Using recess property order (Fixes #1157)

2013-08-21 13:18:37 +02:00

_core.scss

Using recess property order (Fixes #1157)

2013-08-21 13:18:37 +02:00

_extras.scss

Using recess property order (Fixes #1157)

2013-08-21 13:18:37 +02:00

_icons.scss

merge conficts

2013-09-30 18:22:41 -04:00

_mixins.scss

Fixes #1338

2013-08-22 17:53:55 +02:00

_path.scss

Using recess property order (Fixes #1157)

2013-08-21 13:18:37 +02:00

_variables.scss

merge conficts

2013-09-30 18:22:41 -04:00

font-awesome-ie7.scss

merge conficts

2013-09-30 18:22:41 -04:00

font-awesome.scss

adding pagelines icon

2013-09-30 18:19:36 -04:00