diff options
| author | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
|---|---|---|
| committer | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
| commit | 98f0d46f2bbddf86e8d202b533af35fa79da2d2f (patch) | |
| tree | 297d677cfa76bb20d4e80803343c69b99c939e37 /bootstrap2/static/img | |
| parent | 2950b6abdad62fdd74682880acdec32f9b417420 (diff) | |
| parent | 83892b7112e27721218556c4030cdd5c8d26f98b (diff) | |
| download | pelican-themes-98f0d46f2bbddf86e8d202b533af35fa79da2d2f.tar.gz | |
[dev-random] resolved conflicts
Diffstat (limited to 'bootstrap2/static/img')
| -rw-r--r-- | bootstrap2/static/img/glyphicons-halflings-white.png | bin | 0 -> 4352 bytes |
| -rw-r--r-- | bootstrap2/static/img/glyphicons-halflings.png | bin | 0 -> 4352 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap2/static/img/glyphicons-halflings-white.png b/bootstrap2/static/img/glyphicons-halflings-white.png Binary files differnew file mode 100644 index 0000000..a20760b --- /dev/null +++ b/bootstrap2/static/img/glyphicons-halflings-white.png diff --git a/bootstrap2/static/img/glyphicons-halflings.png b/bootstrap2/static/img/glyphicons-halflings.png Binary files differnew file mode 100644 index 0000000..92d4445 --- /dev/null +++ b/bootstrap2/static/img/glyphicons-halflings.png |
