summaryrefslogtreecommitdiff
path: root/libre/django13
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-22 10:10:33 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-22 10:10:33 +0200
commit63a7121f637a74e882cceb03d8a6470dd817e9ec (patch)
treee40e8cad1d599a69523673f2f3737b7564fb5b1c /libre/django13
parent4e66a1c1c541a0b60aa63f4d846c5e6f225b71b8 (diff)
parent3faf011988bf1728989962e062a474aaa62b55f5 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/fdm/PKGBUILD community/milkytracker/PKGBUILD community/tinyxml/PKGBUILD extra/llvm/PKGBUILD
Diffstat (limited to 'libre/django13')
0 files changed, 0 insertions, 0 deletions