aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-08-21 09:25:10 +0100
committerLouise Crow <louise.crow@gmail.com>2014-08-21 09:25:10 +0100
commitd792c5a0562b330e50ab35a0b2c0e9cc1bf704f9 (patch)
tree1b2c1d5050d83202a73a795d30381524f708acd5
parenta097b1e91076d7b13aa6790e59d25f60de912a97 (diff)
parent40abf0831fdf9cd6dee2f8d412be6d19558c46d7 (diff)
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
-rw-r--r--config/nginx-ssl.conf.example (renamed from config/nginx-ssl.conf-example)0
1 files changed, 0 insertions, 0 deletions
diff --git a/config/nginx-ssl.conf-example b/config/nginx-ssl.conf.example
index c623c8e96..c623c8e96 100644
--- a/config/nginx-ssl.conf-example
+++ b/config/nginx-ssl.conf.example