Michael Gapczynski
|
e1bde1a78e
|
Merge branch 'master' into sharing
Conflicts:
files/templates/index.php
|
2011-08-10 13:40:47 -04:00 |
Jakob Sack
|
f633492dfc
|
Update SabreDAV
|
2011-08-10 14:39:12 +02:00 |
|
Michael Gapczynski
|
ec6aed8475
|
Merge branch 'master' into sharing
|
2011-08-09 10:42:50 -04:00 |
|
Michael Gapczynski
|
9a8eb7298c
|
Actually add the chosen plugin
|
2011-08-09 10:40:01 -04:00 |
Robin Appelman
|
1419d7f2b0
|
remove prototype versions of chosen
|
2011-08-09 16:31:16 +02:00 |
|
Robin Appelman
|
88e2b3a857
|
initial work on new user management
|
2011-08-09 15:29:13 +02:00 |
Frank Karlitschek
|
f5a030f4ae
|
remove the ownCloud 3D support and add lot's of usefull 3rd party libraries instead.
|
2011-08-07 17:36:49 +02:00 |