diff options
| author | Nikita Bernstein | 2012-06-24 01:27:46 -0400 |
|---|---|---|
| committer | Nikita Bernstein | 2012-06-24 01:27:46 -0400 |
| commit | ebe3abd8fd8a9dc3b313aa088229e79da2e270d2 (patch) | |
| tree | 2d4a3519623069b193af3c08ca81f8d8fe4b6404 /Resources/friendship/ui/ui.js | |
| parent | 0e8de45a18994c14522f77156a5ac8fb3d2bdd99 (diff) | |
| parent | b847cd11cebcc0a56ffc2043d4372e3be488e45c (diff) | |
| download | LikeFeed-ebe3abd8fd8a9dc3b313aa088229e79da2e270d2.tar.bz2 | |
Merge branch 'master' of https://github.com/teddywing/LikeFeed
Conflicts:
Resources/friendship/ui/LikeList.js
Diffstat (limited to 'Resources/friendship/ui/ui.js')
| -rw-r--r-- | Resources/friendship/ui/ui.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Resources/friendship/ui/ui.js b/Resources/friendship/ui/ui.js index 76def2e..f810b87 100644 --- a/Resources/friendship/ui/ui.js +++ b/Resources/friendship/ui/ui.js @@ -6,5 +6,6 @@ Ti.include( '/friendship/ui/ApplicationWindow.js', '/friendship/ui/LikeList.js', '/friendship/ui/LoginWindow.js', - '/friendship/ui/WebView.js' + '/friendship/ui/WebView.js', + '/friendship/ui/ActivityIndicator.js' ) |