summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-03-20 19:03:36 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-03-20 19:03:36 +0100
commit082602abeed3ac6d29e1eb549aa184d72e488324 (patch)
tree1fa5f2df11a88c01f8bcff3e2519bcb27d021c8e /.gitmodules
parente655116a364f646e849322c4fbc61fc77f30e4ac (diff)
parentd7ba1c6f83f543f5d1255beb520eb16da9930894 (diff)
downloadclientdata-082602abeed3ac6d29e1eb549aa184d72e488324.tar.gz
clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.tar.bz2
clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.tar.xz
clientdata-082602abeed3ac6d29e1eb549aa184d72e488324.zip
Merge branch 'easter'
Conflicts: items.xml
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions