summaryrefslogtreecommitdiff
path: root/social
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-16 11:57:04 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-16 11:57:04 +0100
commit0e419b3bf8abe456c265cc1cd395129f50dde6f9 (patch)
tree900321543d00bff1def8e0d2075fa072857d8cdb /social
parent363603de616fec82753ad92178001af029755e3b (diff)
parentd1335cc6b44826a3ae6934a40bd618bfddcd2e6e (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/mosh/PKGBUILD
Diffstat (limited to 'social')
0 files changed, 0 insertions, 0 deletions