diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-09-15 10:47:10 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-09-15 10:47:10 +0100 |
| commit | e15acb86050ff4e90441a9f5772b1f985fd944cf (patch) | |
| tree | 9e09930e368f8ace79f9089e21851028cecf99c1 /.gitmodules | |
| parent | b4258ad041b8e0c8102e57e662970c6c3afe56a6 (diff) | |
| parent | 9b7c7320d7926c4d8aaa8b68bb677114b292aa6a (diff) | |
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts:
.uzbl/bookmarks
.uzbl/config
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions