]> git.99rst.org Git - irssi-scripts.irssi.org.git/commitdiff
git.99rst.org / irssi-scripts.irssi.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a39412 71dba3f)
Merge branch 'gh-pages' of gh:irssi/scripts.irssi.org into gh-pages
authorDavid Leadbeater <redacted>
Sat, 10 Jan 2015 16:57:01 +0000 (16:57 +0000)
committerDavid Leadbeater <redacted>
Sat, 10 Jan 2015 16:57:01 +0000 (16:57 +0000)
Conflicts:
_data/scripts.yaml

1  2 
_data/scripts.yaml patch | diff1 | diff2 | blob | history

diff --cc _data/scripts.yaml
Simple merge
git clone https://git.99rst.org/PROJECT