diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
| commit | 0e7099174fdef951c81880b51e23342fcde86374 (patch) | |
| tree | 28e99fd804674e3ac025a73a061c73f0ce6d7870 /templates/vhosts/php_wordpress/CentOS.erb | |
| parent | 3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff) | |
| parent | bf36ba5e988a7bb3f163ed0575020ef714519edc (diff) | |
Merge remote-tracking branch 'shared/master' into riseup
Conflicts:
README
Diffstat (limited to 'templates/vhosts/php_wordpress/CentOS.erb')
| l--------- | templates/vhosts/php_wordpress/CentOS.erb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb deleted file mode 120000 index 36dc938..0000000 --- a/templates/vhosts/php_wordpress/CentOS.erb +++ /dev/null @@ -1 +0,0 @@ -php_wordpress.erb
\ No newline at end of file |