Merge branch 'f18'
Conflicts: .gitignore sources wordpress.spec
This commit is contained in:
commit
d9051ff465
1 changed files with 1 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -39,3 +39,4 @@ wordpress-3.0.1.tar.gz
|
|||
/wordpress-3.5.1.tar.gz
|
||||
/wordpress-3.5.2.tar.gz
|
||||
/wordpress-3.6.tar.gz
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue