summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorcpanato <ctadeu@gmail.com>2018-08-10 15:03:18 +0200
committercpanato <ctadeu@gmail.com>2018-08-10 15:03:18 +0200
commit620d55810db143b597cadc62f9210067e2589bb5 (patch)
treedb4ffd446218c94e38625d20e9fa0854e2f95603 /Makefile
parentd8c8a19d355fdd67a984fc696269521919bb58b5 (diff)
parent4299ef312bfcafaa12546e929258a718ea19e9d7 (diff)
downloadchat-620d55810db143b597cadc62f9210067e2589bb5.tar.gz
chat-620d55810db143b597cadc62f9210067e2589bb5.tar.bz2
chat-620d55810db143b597cadc62f9210067e2589bb5.zip
Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-merge-20180810
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions