diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:37:13 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:37:13 +0100 |
| commit | fccffdf4f70d5f9fa12ad6e75187be1728026823 (patch) | |
| tree | 7d60b327cff1a2aa2f0d1ff5e5b3ed65791966b7 /lib/views/general | |
| parent | 550b1e66a97f34ae05f0ff425bd1dd768ed90ec2 (diff) | |
| parent | f1f0e1762d368b074bc99ad0a344b33ddc4d33a8 (diff) | |
Merge branch 'master' into develop
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 |