ed14541aea
Removed stray debug log write
2013-10-02 16:44:38 +02:00
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
9eab8b39df
Merge branch 'master' into fixing-4620-master
2013-10-01 22:57:46 +02:00
e2fe71b6e7
Merge branch 'master' into lib-private-master-2
2013-10-01 16:11:59 +02:00
02d6976263
Merge branch 'master' into lib-private-master-2
2013-09-30 21:29:58 +02:00
8e0060405d
reorganize file in lib
2013-09-30 16:39:03 +02:00
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
Vincent Petry
Thomas Müller