bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source 
Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb
This commit is contained in:
HausdorffHimself
2013-08-13 19:05:26 +02:00
parent c73984e81d d988c22e29
commit c7d63c4c19
94 changed files with 2318 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/calendars_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module CalendarsHelper
end

2
app/helpers/calentries_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module CalentriesHelper
end