diff options
| author | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
| commit | 336d5f786bbd1aaf1847007db64e55f96e585b9d (patch) | |
| tree | 0a18244ba8d21ed821c52edb2d44544b5358aa26 /core/app | |
| parent | cf9ed38ab1840092352efdbb71bfeb5bc3b9f9d5 (diff) | |
| parent | 09003d3d2df7c250d3a0b55e83094e5e27094859 (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'core/app')
| -rw-r--r-- | core/app/assets/images/leap_web_core/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/assets/javascripts/leap_web_core/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/assets/stylesheets/leap_web_core/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/controllers/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/controllers/home_controller.rb | 5 | ||||
| -rw-r--r-- | core/app/helpers/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/mailers/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/models/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/views/.gitkeep | 0 | ||||
| -rw-r--r-- | core/app/views/home/index.html.haml | 1 |
10 files changed, 0 insertions, 6 deletions
diff --git a/core/app/assets/images/leap_web_core/.gitkeep b/core/app/assets/images/leap_web_core/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/assets/images/leap_web_core/.gitkeep +++ /dev/null diff --git a/core/app/assets/javascripts/leap_web_core/.gitkeep b/core/app/assets/javascripts/leap_web_core/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/assets/javascripts/leap_web_core/.gitkeep +++ /dev/null diff --git a/core/app/assets/stylesheets/leap_web_core/.gitkeep b/core/app/assets/stylesheets/leap_web_core/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/assets/stylesheets/leap_web_core/.gitkeep +++ /dev/null diff --git a/core/app/controllers/.gitkeep b/core/app/controllers/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/controllers/.gitkeep +++ /dev/null diff --git a/core/app/controllers/home_controller.rb b/core/app/controllers/home_controller.rb deleted file mode 100644 index 7db5397..0000000 --- a/core/app/controllers/home_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ - -class HomeController < ApplicationController - def index - end -end diff --git a/core/app/helpers/.gitkeep b/core/app/helpers/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/helpers/.gitkeep +++ /dev/null diff --git a/core/app/mailers/.gitkeep b/core/app/mailers/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/mailers/.gitkeep +++ /dev/null diff --git a/core/app/models/.gitkeep b/core/app/models/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/models/.gitkeep +++ /dev/null diff --git a/core/app/views/.gitkeep b/core/app/views/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/core/app/views/.gitkeep +++ /dev/null diff --git a/core/app/views/home/index.html.haml b/core/app/views/home/index.html.haml deleted file mode 100644 index 82f5152..0000000 --- a/core/app/views/home/index.html.haml +++ /dev/null @@ -1 +0,0 @@ -%h3 Home |