diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-03-02 09:42:51 +0100 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-03-02 09:42:51 +0100 |
| commit | 13418ac9e709c85cfbaba501efb69c8bdff7ddd4 (patch) | |
| tree | e148a9d633a6d3832be7746d182d3798d64f4cb8 /favicon.ico | |
| parent | 939372574745e895c172f21e1fe3994946fbf760 (diff) | |
| parent | 9f0a62f7c12c8b91cef0df8189db38711838a051 (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
component.json
package.json
Diffstat (limited to 'favicon.ico')
0 files changed, 0 insertions, 0 deletions