rpms/znc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5fd9362b70
znc/.gitignore

6 lines
79 B
Plaintext
Raw Normal View History

Merge branch 'master' into el5 Conflicts: .gitignore
2010-09-25 00:31:47 +00:00
<<<<<<< HEAD
Update to znc-0.093.svn2101 to fix two CVE's
2010-08-11 00:06:44 +00:00
znc-0.093.svn2101.tar.bz2
Merge branch 'master' into el5 Conflicts: .gitignore
2010-09-25 00:31:47 +00:00
=======
Fix .gitignore
2010-09-25 00:31:01 +00:00
znc-0.094.tar.gz
Merge branch 'master' into el5 Conflicts: .gitignore
2010-09-25 00:31:47 +00:00
>>>>>>> master
Reference in New Issue Copy Permalink