diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-30 12:14:26 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-30 12:14:26 +0100 |
| commit | 945fb4b52727115575bbb3941b1151cd21a6a60e (patch) | |
| tree | 11c2b5304f8e10689caf6d27d14197cab1491c2a /lib/views/general | |
| parent | e90c170f84ab4b91b25c673045bc0bbec0c5788a (diff) | |
| parent | ec01e0946dfab8db11e63ad565d18958a8fec1a6 (diff) | |
Merge remote-tracking branch 'mysociety_github/rails-3' into rails-3use-with-alaveteli-0.11rails-3
Diffstat (limited to 'lib/views/general')
| -rw-r--r-- | lib/views/general/_before_head_end.html.erb (renamed from lib/views/general/_before_head_end.rhtml) | 0 | ||||
| -rw-r--r-- | lib/views/general/_frontpage_intro_sentence.html.erb (renamed from lib/views/general/_frontpage_intro_sentence.rhtml) | 0 | ||||
| -rw-r--r-- | lib/views/general/_orglink.html.erb (renamed from lib/views/general/_orglink.rhtml) | 0 | ||||
| -rw-r--r-- | lib/views/general/_popup_banner.html.erb (renamed from lib/views/general/_popup_banner.rhtml) | 0 | ||||
| -rw-r--r-- | lib/views/general/mycontroller.html.erb (renamed from lib/views/general/mycontroller.rhtml) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/lib/views/general/_before_head_end.rhtml b/lib/views/general/_before_head_end.html.erb index 1644299..1644299 100644 --- a/lib/views/general/_before_head_end.rhtml +++ b/lib/views/general/_before_head_end.html.erb diff --git a/lib/views/general/_frontpage_intro_sentence.rhtml b/lib/views/general/_frontpage_intro_sentence.html.erb index cfba8f6..cfba8f6 100644 --- a/lib/views/general/_frontpage_intro_sentence.rhtml +++ b/lib/views/general/_frontpage_intro_sentence.html.erb diff --git a/lib/views/general/_orglink.rhtml b/lib/views/general/_orglink.html.erb index 9535a79..9535a79 100644 --- a/lib/views/general/_orglink.rhtml +++ b/lib/views/general/_orglink.html.erb diff --git a/lib/views/general/_popup_banner.rhtml b/lib/views/general/_popup_banner.html.erb index 49c9ec2..49c9ec2 100644 --- a/lib/views/general/_popup_banner.rhtml +++ b/lib/views/general/_popup_banner.html.erb diff --git a/lib/views/general/mycontroller.rhtml b/lib/views/general/mycontroller.html.erb index ad642d3..ad642d3 100644 --- a/lib/views/general/mycontroller.rhtml +++ b/lib/views/general/mycontroller.html.erb |