Merge branch 'master' of https://github.com/bikebike/BikeBike
Conflicts: Gemfile Gemfile.lock
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
// Place all the styles related to the event_types controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
@@ -0,0 +1,3 @@
|
||||
// Place all the styles related to the events controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
@@ -0,0 +1,3 @@
|
||||
// Place all the styles related to the workshop_facilitators controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
@@ -0,0 +1,3 @@
|
||||
// Place all the styles related to the workshop_requested_resources controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
@@ -0,0 +1,3 @@
|
||||
// Place all the styles related to the workshops controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
Reference in New Issue
Block a user