summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-07-10 09:14:12 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2015-07-10 09:14:12 +0200
commit6cfb194220d8099649e898b24feee17d051829a3 (patch)
tree8e5c57570373f2f5dc35cbd78d1b5a440adc7c74 /config
parentaaee988e82605cffb5b4219c078730bba6afa865 (diff)
fix contributing file conflicts
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions