summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-02 15:57:18 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-02 15:57:18 -0300
commit7bc94242398ad220908a214d0f457db017396f81 (patch)
tree3af7fdc5ec5c9cba010fbc13fc62982ae6d7f886 /.gitignore
parentd13c6b2567803d73c8c2fd33495c081ce736eb96 (diff)
parente2a3431c13773af43b50797566feedc15fdf94ce (diff)
Merge remote-tracking branch 'refs/remotes/drebs/feature/5388_avoid-concurrent-syncs-update-handler-conflict' into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions