rembo10 11b5c9ced1 Merge conflict from basilfx/multicore merge

2014-03-31 16:57:48 -07:00

..

css

Fixed some merge conflicts with the songkick merge from maiis

2014-02-27 18:24:47 -08:00

fonts

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

images

add songkick upcoming concerts on ArtistPage

2014-02-13 22:44:36 +00:00

js

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

album.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

artist.html

Merge remote-tracking branch 'gotson/artist-sort' into develop

2014-03-31 16:53:21 -07:00

base.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

config.html

Merge conflict from basilfx/multicore merge

2014-03-31 16:57:48 -07:00

extras.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

history.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

index.html

Brought back 'The' in front of artist names in the index

2014-03-27 20:13:39 -07:00

logs.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

manage.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

managealbums.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

manageartists.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

managemanual.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

managenew.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

manageunmatched.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

searchresults.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

shutdown.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00

upcoming.html

convert all icons to font-awesome vector based / retina compatible icons

2014-02-15 01:54:55 +00:00