Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel

Browse source

Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js

...

This commit is contained in:

Naomi Aro 2011-06-21 11:20:35 +02:00

parent dd4ea127fc b6888489e0

commit 253eb811c7

42 changed files with 3966 additions and 499 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

airtime_mvc/public/css/img/desktop.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 441 B

BIN

airtime_mvc/public/css/img/documents.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 666 B

BIN

airtime_mvc/public/css/img/folder.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 572 B

BIN

airtime_mvc/public/css/img/loading.gif Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

airtime_mvc/public/css/img/unknown.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 402 B