Thomas Blazek
|
79ba089b70
|
Merge branch 'master' of https://github.com/Inachos/fetsite
Conflicts:
Gemfile.lock
config/routes.rb
|
2015-01-11 22:18:05 +01:00 |
|
|
|
7d56d10431
|
comments
|
2014-10-17 10:17:23 +02:00 |
|
Sai
|
585b386e7c
|
change meetings
|
2014-08-27 15:22:47 +02:00 |
|
Thomas Blazek
|
1db27955de
|
Merge branch 'master' of https://github.com/andreassteph/fetsite
Conflicts:
config/routes.rb
|
2013-08-19 15:47:12 +02:00 |
|
Thomas Blazek
|
f58c359d36
|
Introducing Lecturers
|
2013-08-19 15:43:54 +02:00 |
|
Andreas Stephanides
|
4c48a4b769
|
fetzneditions
|
2013-08-19 15:42:08 +02:00 |
|
Andreas Stephanides
|
34b602e126
|
a lot of new models ...
Fotogallary, gremien, fetprofil,
|
2013-08-19 15:39:56 +02:00 |
|
HausdorffHimself
|
c7d63c4c19
|
Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
app/views/layouts/menu.html.erb
config/routes.rb
|
2013-08-13 19:05:26 +02:00 |
|
Andreas Stephanides
|
6bb35c110a
|
calendar feature generiert
|
2013-08-06 00:48:45 +02:00 |
|
HausdorffHimself
|
ac4cb5d0fe
|
New Feature: Themen/Informationen
|
2013-08-05 18:31:04 +02:00 |
|
