|
171 | 171 | ### Apps |
172 | 172 |
|
173 | 173 | INSTALLED_APPS = [ |
| 174 | +<<<<<<< HEAD |
174 | 175 | "django.contrib.auth", |
175 | 176 | "django.contrib.contenttypes", |
176 | 177 | "django.contrib.sessions", |
|
195 | 196 | "widget_tweaks", |
196 | 197 | "django_countries", |
197 | 198 | "sorl.thumbnail", |
| 199 | + "pydotorg", |
198 | 200 | "apps.banners", |
199 | 201 | "apps.blogs", |
200 | 202 | "apps.boxes", |
|
215 | 217 | "apps.work_groups", |
216 | 218 | "allauth", |
217 | 219 | "allauth.account", |
| 220 | +||||||| parent of ac1d365e (purge sitetree cache on change) |
| 221 | + 'django.contrib.auth', |
| 222 | + 'django.contrib.contenttypes', |
| 223 | + 'django.contrib.sessions', |
| 224 | + 'django.contrib.sites', |
| 225 | + 'django.contrib.redirects', |
| 226 | + 'django.contrib.messages', |
| 227 | + 'django.contrib.staticfiles', |
| 228 | + 'django.contrib.humanize', |
| 229 | + |
| 230 | + 'admin_interface', |
| 231 | + 'colorfield', |
| 232 | + 'django.contrib.admin', |
| 233 | + 'django.contrib.admindocs', |
| 234 | + |
| 235 | + 'django_celery_beat', |
| 236 | + 'django_translation_aliases', |
| 237 | + 'pipeline', |
| 238 | + 'sitetree', |
| 239 | + 'imagekit', |
| 240 | + 'haystack', |
| 241 | + 'honeypot', |
| 242 | + 'waffle', |
| 243 | + 'ordered_model', |
| 244 | + 'widget_tweaks', |
| 245 | + 'django_countries', |
| 246 | + 'sorl.thumbnail', |
| 247 | + |
| 248 | + 'banners', |
| 249 | + 'blogs', |
| 250 | + 'boxes', |
| 251 | + 'cms', |
| 252 | + 'codesamples', |
| 253 | + 'community', |
| 254 | + 'companies', |
| 255 | + 'downloads', |
| 256 | + 'events', |
| 257 | + 'jobs', |
| 258 | + 'mailing', |
| 259 | + 'minutes', |
| 260 | + 'nominations', |
| 261 | + 'pages', |
| 262 | + 'sponsors', |
| 263 | + 'successstories', |
| 264 | + 'users', |
| 265 | + 'work_groups', |
| 266 | + |
| 267 | + 'allauth', |
| 268 | + 'allauth.account', |
| 269 | + |
| 270 | +======= |
| 271 | + 'django.contrib.auth', |
| 272 | + 'django.contrib.contenttypes', |
| 273 | + 'django.contrib.sessions', |
| 274 | + 'django.contrib.sites', |
| 275 | + 'django.contrib.redirects', |
| 276 | + 'django.contrib.messages', |
| 277 | + 'django.contrib.staticfiles', |
| 278 | + 'django.contrib.humanize', |
| 279 | + |
| 280 | + 'admin_interface', |
| 281 | + 'colorfield', |
| 282 | + 'django.contrib.admin', |
| 283 | + 'django.contrib.admindocs', |
| 284 | + |
| 285 | + 'django_celery_beat', |
| 286 | + 'django_translation_aliases', |
| 287 | + 'pipeline', |
| 288 | + 'sitetree', |
| 289 | + 'imagekit', |
| 290 | + 'haystack', |
| 291 | + 'honeypot', |
| 292 | + 'waffle', |
| 293 | + 'ordered_model', |
| 294 | + 'widget_tweaks', |
| 295 | + 'django_countries', |
| 296 | + 'sorl.thumbnail', |
| 297 | + |
| 298 | + 'pydotorg', |
| 299 | + 'banners', |
| 300 | + 'blogs', |
| 301 | + 'boxes', |
| 302 | + 'cms', |
| 303 | + 'codesamples', |
| 304 | + 'community', |
| 305 | + 'companies', |
| 306 | + 'downloads', |
| 307 | + 'events', |
| 308 | + 'jobs', |
| 309 | + 'mailing', |
| 310 | + 'minutes', |
| 311 | + 'nominations', |
| 312 | + 'pages', |
| 313 | + 'sponsors', |
| 314 | + 'successstories', |
| 315 | + 'users', |
| 316 | + 'work_groups', |
| 317 | + |
| 318 | + 'allauth', |
| 319 | + 'allauth.account', |
| 320 | + |
| 321 | +>>>>>>> ac1d365e (purge sitetree cache on change) |
218 | 322 | # Tastypie needs the `users` app to be already loaded. |
219 | 323 | "tastypie", |
220 | 324 | "rest_framework", |
|
0 commit comments