Bart Visscher
|
b35b22977c
|
Move legacy file to correct location
|
2013-10-02 09:15:31 +02:00 |
|
Bart Visscher
|
46b5202f4a
|
Merge branch 'master' into convert-oc_appconfig
|
2013-10-02 07:42:06 +02:00 |
Thomas Müller
|
e2fe71b6e7
|
Merge branch 'master' into lib-private-master-2
|
2013-10-01 16:11:59 +02:00 |
|
Thomas Müller
|
02d6976263
|
Merge branch 'master' into lib-private-master-2
|
2013-09-30 21:29:58 +02:00 |
|
Thomas Müller
|
8e0060405d
|
reorganize file in lib
|
2013-09-30 16:39:03 +02:00 |
|
Thomas Müller
|
9c9dc276b7
|
move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
lib/private/vcategories.php
|
2013-09-30 16:36:59 +02:00 |