summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-05-30 23:17:46 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-05-30 23:17:46 +0100
commit25da277ab11e92bab8d27ae29ffd621be71cd56c (patch)
tree5e38f7a2e40b677bf741aadae743d13e434da466 /.gitmodules
parent1a10bbc712c64539ee9e0c73a4b360417449e208 (diff)
parent2704384c10aa5897914beea55fd31a82d78dbd2b (diff)
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts: mutt/alias nvim/mySnippets/cpp.snippets
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions