diff options
| author | Teddy Wing | 2012-06-24 05:38:01 -0400 |
|---|---|---|
| committer | Teddy Wing | 2012-06-24 05:38:01 -0400 |
| commit | 6f5e24ff830fa83e7fc640c4ce5599381dbf282c (patch) | |
| tree | 2e2003086f403aeedb4ecbc29bc0eabf474cda89 /Resources/friendship/core/core.js | |
| parent | 4ca2c86c189db5b476c9bef9c4b8f0744eada30b (diff) | |
| parent | 7f28bc955883e3847eae5ddaeac87445567660b3 (diff) | |
| download | LikeFeed-6f5e24ff830fa83e7fc640c4ce5599381dbf282c.tar.bz2 | |
Merge branch 'master' of github.com:teddywing/LikeFeed
Merged my & Nikita's table view UI edits.
Conflicts:
Resources/friendship/ui/LikeList.js
Diffstat (limited to 'Resources/friendship/core/core.js')
| -rw-r--r-- | Resources/friendship/core/core.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Resources/friendship/core/core.js b/Resources/friendship/core/core.js index dd75086..fe6cb00 100644 --- a/Resources/friendship/core/core.js +++ b/Resources/friendship/core/core.js @@ -3,5 +3,6 @@ })(); Ti.include( - '/friendship/core/FacebookFQL.js' + '/friendship/core/FacebookFQL.js', + '/friendship/core/DataManipulation.js' ) |