diff options
author | Leo P | 2016-03-10 19:36:24 -0500 |
---|---|---|
committer | Leo P | 2016-03-10 19:36:24 -0500 |
commit | bc254e79dbac31934278880a7b24537a07f64ea3 (patch) | |
tree | 2ed89fef02c91ac2c65a7b817ada132f4cd304f1 /.SRCINFO | |
parent | 6035002f3c275a1b42f2701efb941bbeeab89523 (diff) | |
parent | 28168423b13b14948c0b6dce5e163b99fbbb1e57 (diff) | |
download | aur-bc254e79dbac31934278880a7b24537a07f64ea3.tar.gz |
Merge branch 'master' of ssh://aur.archlinux.org/nginx-nchan-git
# Conflicts:
# .SRCINFO
# PKGBUILD
Diffstat (limited to '.SRCINFO')
0 files changed, 0 insertions, 0 deletions